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

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

diff --git a/Basic/SourceManager.cpp b/Basic/SourceManager.cpp
index 4f9753739efb48e84bab26376ea351aaf586bf6a..73ac2abe26f50bce40f3f879ad40d4b448d38d57 100644 (file)
--- a/Basic/SourceManager.cpp
+++ b/Basic/SourceManager.cpp
@@ -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

diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h
index d153552dfc5b57ab723934c7dd79f0eca871793a..4cffb350b98a4cd77b05d47a3d58525ff7b0f1c7 100644 (file)
--- a/include/clang/Basic/SourceLocation.h
+++ b/include/clang/Basic/SourceLocation.h
@@ -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;