replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

the macro start and macro end bits in source location are dead, remove them. 

llvm-svn: 46685
This commit is contained in:
Chris Lattner 2008-02-03 08:24:13 +00:00
parent c7a4ba044b
commit 15e4ad81c3
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/Basic/SourceManager.cpp
View File

@ -193,12 +193,12 @@ SourceLocation SourceManager::getInstantiationLoc(SourceLocation PhysLoc,
int PhysDelta = PhysLoc.getRawFilePos() -
LastOne.getPhysicalLoc().getRawFilePos();
if (SourceLocation::isValidMacroPhysOffs(PhysDelta))
return SourceLocation::getMacroLoc(i, PhysDelta, false, false);
return SourceLocation::getMacroLoc(i, PhysDelta);
}
MacroIDs.push_back(MacroIDInfo::get(InstantLoc, PhysLoc));
return SourceLocation::getMacroLoc(MacroIDs.size()-1, 0, false, false);
return SourceLocation::getMacroLoc(MacroIDs.size()-1, 0);
}
/// getBufferData - Return a pointer to the start and end of the character

11
clang/include/clang/Basic/SourceLocation.h
View File

@ -43,10 +43,8 @@ public:
// MacroID Layout:
// bit 31: 1 -> MacroID, 0 -> FileID (invalid for MacroID)
// bit 30: 1 -> Start of macro expansion marker.
MacroStartOfExpansionBit = 30,
// bit 29: 1 -> End of macro expansion marker.
MacroEndOfExpansionBit = 29,
// bit 29,30: unused.
// bits 28...9 -> MacroID number.
MacroIDBits = 20,
// bits 8...0 -> Macro Physical offset
@ -92,8 +90,7 @@ public:
return -Val < (1 << (MacroPhysOffsBits-1));
}
static SourceLocation getMacroLoc(unsigned MacroID, int PhysOffs,
bool isExpansionStart, bool isExpansionEnd){
static SourceLocation getMacroLoc(unsigned MacroID, int PhysOffs){
assert(MacroID < (1 << MacroIDBits) && "Too many macros!");
assert(isValidMacroPhysOffs(PhysOffs) && "Physoffs too large!");
@ -102,8 +99,6 @@ public:
SourceLocation L;
L.ID = (1 << 31) |
(isExpansionStart << MacroStartOfExpansionBit) |
(isExpansionEnd << MacroEndOfExpansionBit) |
(MacroID << MacroPhysOffsBits) |
PhysOffs;
return L;