diff options
| -rw-r--r-- | Basic/SourceManager.cpp | 2 | ||||
| -rw-r--r-- | include/clang/Basic/SourceManager.h | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Basic/SourceManager.cpp b/Basic/SourceManager.cpp index 74e88c18dc..03fa203b2e 100644 --- a/Basic/SourceManager.cpp +++ b/Basic/SourceManager.cpp @@ -185,7 +185,7 @@ SourceLocation SourceManager::getInstantiationLoc(SourceLocation PhysLoc, // The instanitation point and source physloc have to exactly match to reuse // (for now). We could allow "nearby" instantiations in the future. - if (LastOne.getInstantiationLoc() != InstantLoc || + if (LastOne.getVirtualLoc() != InstantLoc || LastOne.getPhysicalLoc().getFileID() != PhysLoc.getFileID()) continue; diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index b08886efa5..672a2c18b5 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -130,18 +130,18 @@ namespace SrcMgr { /// the token came from. An actual macro SourceLocation stores deltas from /// these positions. class MacroIDInfo { - SourceLocation InstantiationLoc, PhysicalLoc; + SourceLocation VirtualLoc, PhysicalLoc; public: - SourceLocation getInstantiationLoc() const { return InstantiationLoc; } + SourceLocation getVirtualLoc() const { return VirtualLoc; } SourceLocation getPhysicalLoc() const { return PhysicalLoc; } - /// get - Return a MacroID for a macro expansion. IL specifies - /// the instantiation location, and PL specifies the physical location - /// (where the characters from the token come from). Both IL and PL refer - /// to normal File SLocs. - static MacroIDInfo get(SourceLocation IL, SourceLocation PL) { + /// get - Return a MacroID for a macro expansion. VL specifies + /// the instantiation location (where the macro is expanded), and PL + /// specifies the physical location (where the characters from the token + /// come from). Both VL and PL refer to normal File SLocs. + static MacroIDInfo get(SourceLocation VL, SourceLocation PL) { MacroIDInfo X; - X.InstantiationLoc = IL; + X.VirtualLoc = VL; X.PhysicalLoc = PL; return X; } @@ -291,7 +291,7 @@ public: // File locations are both physical and logical. if (Loc.isFileID()) return Loc; - return MacroIDs[Loc.getMacroID()].getInstantiationLoc(); + return MacroIDs[Loc.getMacroID()].getVirtualLoc(); } /// getPhysicalLoc - Given a SourceLocation object, return the physical |