diff options
| -rw-r--r-- | clang/include/clang/Basic/SourceManager.h | 4 | ||||
| -rw-r--r-- | clang/lib/Basic/SourceManager.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/SourceManager.h b/clang/include/clang/Basic/SourceManager.h index 6627391df96..4db93235593 100644 --- a/clang/include/clang/Basic/SourceManager.h +++ b/clang/include/clang/Basic/SourceManager.h @@ -729,7 +729,7 @@ public: // Handle the non-mapped case inline, defer to out of line code to handle // expansions. if (Loc.isFileID()) return Loc; - return getInstantiationLocSlowCase(Loc); + return getExpansionLocSlowCase(Loc); } /// getImmediateExpansionRange - Loc is required to be an expansion location. @@ -1130,7 +1130,7 @@ private: FileID getFileIDLocal(unsigned SLocOffset) const; FileID getFileIDLoaded(unsigned SLocOffset) const; - SourceLocation getInstantiationLocSlowCase(SourceLocation Loc) const; + SourceLocation getExpansionLocSlowCase(SourceLocation Loc) const; SourceLocation getSpellingLocSlowCase(SourceLocation Loc) const; std::pair<FileID, unsigned> diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index 30ea39e8a49..63f23649252 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -783,11 +783,11 @@ FileID SourceManager::getFileIDLoaded(unsigned SLocOffset) const { } SourceLocation SourceManager:: -getInstantiationLocSlowCase(SourceLocation Loc) const { +getExpansionLocSlowCase(SourceLocation Loc) const { do { // Note: If Loc indicates an offset into a token that came from a macro // expansion (e.g. the 5th character of the token) we do not want to add - // this offset when going to the instantiation location. The instatiation + // this offset when going to the instantiation location. The expansion // location is the macro invocation, which the offset has nothing to do // with. This is unlike when we get the spelling loc, because the offset // directly correspond to the token whose spelling we're inspecting. |
