From: Chris Lattner <sabre@nondot.org>
Date: Mon, 26 Jan 2009 20:15:46 +0000 (+0000)
Subject: allow _Pragmas formed from #defines to keep their full instantiation
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=071831dcc7fb502d8957535366baa6ac7f72e70d;p=clang

allow _Pragmas formed from #defines to keep their full instantiation
history



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63035 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 03d81b3b9a..7f14e7a4a2 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -321,10 +321,9 @@ static SourceLocation GetMappedTokenLoc(Preprocessor &PP,
   
   // 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