Merge with LLVM upstream r160668 (Jul 24th 2012)

Conflicts:
	include/llvm/Support/ELF.h
	lib/CodeGen/AsmPrinter/AsmPrinter.cpp
	lib/Support/Memory.cpp
	lib/Transforms/Instrumentation/AddressSanitizer.cpp

Change-Id: Iddd658cf2eadc7165b2805b446d31af2c5c9917f

1 files changed, 17 insertions, 17 deletions

diff --git a/include/llvm/MC/MCTargetAsmLexer.h b/include/llvm/MC/MCTargetAsmLexer.h
index acb3d4d..f5c8c09 100644
--- a/include/llvm/MC/MCTargetAsmLexer.h
+++ b/include/llvm/MC/MCTargetAsmLexer.h
@@ -14,72 +14,72 @@
 
 namespace llvm {
 class Target;
-  
+
 /// MCTargetAsmLexer - Generic interface to target specific assembly lexers.
 class MCTargetAsmLexer {
   /// The current token
   AsmToken CurTok;
-  
+
   /// The location and description of the current error
   SMLoc ErrLoc;
   std::string Err;
-  
+
   MCTargetAsmLexer(const MCTargetAsmLexer &);   // DO NOT IMPLEMENT
   void operator=(const MCTargetAsmLexer &);  // DO NOT IMPLEMENT
 protected: // Can only create subclasses.
   MCTargetAsmLexer(const Target &);
-  
+
   virtual AsmToken LexToken() = 0;
-  
+
   void SetError(const SMLoc &errLoc, const std::string &err) {
     ErrLoc = errLoc;
     Err = err;
   }
-  
+
   /// TheTarget - The Target that this machine was created for.
   const Target &TheTarget;
   MCAsmLexer *Lexer;
-  
+
 public:
   virtual ~MCTargetAsmLexer();
-  
+
   const Target &getTarget() const { return TheTarget; }
-  
+
   /// InstallLexer - Set the lexer to get tokens from lower-level lexer \arg L.
   void InstallLexer(MCAsmLexer &L) {
     Lexer = &L;
   }
-  
+
   MCAsmLexer *getLexer() {
     return Lexer;
   }
-  
+
   /// Lex - Consume the next token from the input stream and return it.
   const AsmToken &Lex() {
     return CurTok = LexToken();
   }
-  
+
   /// getTok - Get the current (last) lexed token.
   const AsmToken &getTok() {
     return CurTok;
   }
-  
+
   /// getErrLoc - Get the current error location
   const SMLoc &getErrLoc() {
     return ErrLoc;
   }
-  
+
   /// getErr - Get the current error string
   const std::string &getErr() {
     return Err;
   }
-  
+
   /// getKind - Get the kind of current token.
   AsmToken::TokenKind getKind() const { return CurTok.getKind(); }
-  
+
   /// is - Check if the current token has kind \arg K.
   bool is(AsmToken::TokenKind K) const { return CurTok.is(K); }
-  
+
   /// isNot - Check if the current token has kind \arg K.
   bool isNot(AsmToken::TokenKind K) const { return CurTok.isNot(K); }
 };