OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Due to generated tokens expanded by macros, there can be multiple MacroExpansion fileid's, loop over them until we get to something real. 

llvm-svn: 38590
This commit is contained in:
Chris Lattner 2006-06-29 06:33:42 +00:00
parent 0b8cfc2e69
commit dc9f9bf80e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/Basic/SourceManager.cpp
View File

@ -135,7 +135,7 @@ SourceLocation SourceManager::getIncludeLoc(unsigned FileID) const {
const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID); const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID);
// For Macros, the physical loc is specified by the MacroTokenFileID. // For Macros, the physical loc is specified by the MacroTokenFileID.
if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) while (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion)
FIDInfo = &FileIDs[FIDInfo->u.MacroTokenFileID-1]; FIDInfo = &FileIDs[FIDInfo->u.MacroTokenFileID-1];
return FIDInfo->IncludeLoc; return FIDInfo->IncludeLoc;
@ -151,9 +151,10 @@ unsigned SourceManager::getColumnNumber(SourceLocation Loc) const {
// If this is a macro, we need to get the instantiation location. // If this is a macro, we need to get the instantiation location.
const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID); const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID);
if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) { while (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) {
Loc = FIDInfo->IncludeLoc; Loc = FIDInfo->IncludeLoc;
FileID = Loc.getFileID(); FileID = Loc.getFileID();
FIDInfo = getFIDInfo(FileID);
} }
unsigned FilePos = getFilePos(Loc); unsigned FilePos = getFilePos(Loc);
@ -175,7 +176,7 @@ std::string SourceManager::getSourceName(SourceLocation Loc) {
// If this is a macro, we need to get the instantiation location. // If this is a macro, we need to get the instantiation location.
const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID); const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID);
if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) { while (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) {
Loc = FIDInfo->IncludeLoc; Loc = FIDInfo->IncludeLoc;
FIDInfo = getFIDInfo(Loc.getFileID()); FIDInfo = getFIDInfo(Loc.getFileID());
} }
@ -192,7 +193,7 @@ unsigned SourceManager::getLineNumber(SourceLocation Loc) {
unsigned FileID = Loc.getFileID(); unsigned FileID = Loc.getFileID();
// If this is a macro, we need to get the instantiation location. // If this is a macro, we need to get the instantiation location.
const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID); const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID);
if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) { while (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) {
Loc = FIDInfo->IncludeLoc; Loc = FIDInfo->IncludeLoc;
FileID = Loc.getFileID(); FileID = Loc.getFileID();
FIDInfo = getFIDInfo(FileID); FIDInfo = getFIDInfo(FileID);
@ -270,8 +271,10 @@ unsigned SourceManager::getSourceFilePos(SourceLocation Loc) const {
// If this is a macro, we need to get the instantiation location. // If this is a macro, we need to get the instantiation location.
const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(Loc.getFileID()); const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(Loc.getFileID());
if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) while (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) {
return getFilePos(FIDInfo->IncludeLoc); Loc = FIDInfo->IncludeLoc;
FIDInfo = getFIDInfo(Loc.getFileID());
}
return getFilePos(Loc); return getFilePos(Loc);
} }