intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-02 02:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change SourceManager::getInstantiationLoc to take virtual locations, doing its

Browse Source 
virtual->physical mapping explicitly.

llvm-svn: 39867
This commit is contained in:
Chris Lattner
2007-07-15 06:35:27 +00:00
parent 81569d2044
commit 3fc74e2468
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
clang/Basic/SourceManager.cpp
View File

@@ -166,11 +166,12 @@ unsigned SourceManager::createFileID(const InfoRec *File,
/// getInstantiationLoc - Return a new SourceLocation that encodes the fact
/// that a token from physloc PhysLoc should actually be referenced from
/// InstantiationLoc.
SourceLocation SourceManager::getInstantiationLoc(SourceLocation PhysLoc,
SourceLocation SourceManager::getInstantiationLoc(SourceLocation VirtLoc,
SourceLocation InstantLoc) {
assert(getFIDInfo(PhysLoc.getFileID())->IDType !=
SrcMgr::FileIDInfo::MacroExpansion &&
"Location instantiated in a macro?");
// The specified source location may be a mapped location, due to a macro
// instantiation or #line directive. Strip off this information to find out
// where the characters are actually located.
SourceLocation PhysLoc = getPhysicalLoc(VirtLoc);
// Resolve InstantLoc down to a real logical location.
InstantLoc = getLogicalLoc(InstantLoc);

4
clang/Lex/MacroExpander.cpp
View File

@@ -499,8 +499,8 @@ void MacroExpander::Lex(LexerToken &Tok) {
// The token could have come from a prior macro expansion. In that case,
// ignore the macro expand part to get to the physloc. This happens for
// stuff like: #define A(X) X A(A(X)) A(1)
SourceLocation PhysLoc = SrcMgr.getPhysicalLoc(Tok.getLocation());
Tok.setLocation(SrcMgr.getInstantiationLoc(PhysLoc, InstantiateLoc));
Tok.setLocation(SrcMgr.getInstantiationLoc(Tok.getLocation(),
InstantiateLoc));
}
// If this is the first token, set the lexical properties of the token to

5
clang/include/clang/Basic/SourceManager.h
View File

@@ -195,9 +195,8 @@ public:
}
/// getInstantiationLoc - Return a new SourceLocation that encodes the fact
/// that a token from physloc PhysLoc should actually be referenced from
/// InstantiationLoc.
SourceLocation getInstantiationLoc(SourceLocation PhysLoc,
/// that a token at Loc should actually be referenced from InstantiationLoc.
SourceLocation getInstantiationLoc(SourceLocation Loc,
SourceLocation InstantiationLoc);
/// getBuffer - Return the buffer for the specified FileID.