diff options
Diffstat (limited to 'lib/Basic')
| -rw-r--r-- | lib/Basic/DiagnosticIDs.cpp | 2 | ||||
| -rw-r--r-- | lib/Basic/SourceLocation.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp index 19f627e804..08e4420c41 100644 --- a/lib/Basic/DiagnosticIDs.cpp +++ b/lib/Basic/DiagnosticIDs.cpp @@ -540,7 +540,7 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass, Diag.SuppressSystemWarnings && Loc.isValid() && Diag.getSourceManager().isInSystemHeader( - Diag.getSourceManager().getInstantiationLoc(Loc))) + Diag.getSourceManager().getExpansionLoc(Loc))) return DiagnosticIDs::Ignored; return Result; diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp index cf89edb935..84f03fb350 100644 --- a/lib/Basic/SourceLocation.cpp +++ b/lib/Basic/SourceLocation.cpp @@ -54,7 +54,7 @@ void SourceLocation::print(raw_ostream &OS, const SourceManager &SM)const{ return; } - SM.getInstantiationLoc(*this).print(OS, SM); + SM.getExpansionLoc(*this).print(OS, SM); OS << " <Spelling="; SM.getSpellingLoc(*this).print(OS, SM); @@ -75,9 +75,9 @@ FileID FullSourceLoc::getFileID() const { } -FullSourceLoc FullSourceLoc::getInstantiationLoc() const { +FullSourceLoc FullSourceLoc::getExpansionLoc() const { assert(isValid()); - return FullSourceLoc(SrcMgr->getInstantiationLoc(*this), *SrcMgr); + return FullSourceLoc(SrcMgr->getExpansionLoc(*this), *SrcMgr); } FullSourceLoc FullSourceLoc::getSpellingLoc() const { |