[cfe-commits] r63035 - /cfe/trunk/lib/Lex/Lexer.cpp

[Chris Lattner]

Author: lattner
Date: Mon Jan 26 14:15:46 2009
New Revision: 63035

URL: http://llvm.org/viewvc/llvm-project?rev=63035&view=rev
Log:
allow _Pragmas formed from #defines to keep their full instantiation
history


Modified:
    cfe/trunk/lib/Lex/Lexer.cpp

Modified: cfe/trunk/lib/Lex/Lexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Lexer.cpp?rev=63035&r1=63034&r2=63035&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/Lexer.cpp (original)
+++ cfe/trunk/lib/Lex/Lexer.cpp Mon Jan 26 14:15:46 2009
@@ -321,10 +321,9 @@
   
   // Create a new SLoc which is expanded from Instantiation(FileLoc) but whose
   // characters come from spelling(FileLoc)+Offset.
-  SourceLocation InstLoc = SourceMgr.getInstantiationLoc(FileLoc);
   SourceLocation SpellingLoc = SourceMgr.getSpellingLoc(FileLoc);
   SpellingLoc = SpellingLoc.getFileLocWithOffset(CharNo);
-  return SourceMgr.createInstantiationLoc(SpellingLoc, InstLoc, TokLen);
+  return SourceMgr.createInstantiationLoc(SpellingLoc, FileLoc, TokLen);
 }
 
 /// getSourceLocation - Return a source location identifier for the specified