inline a method into its only two call sites.

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

diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h
index 829a7ada8117470b937d278b4f8ed6aeac628037..ba6fd8bd7a764eb16dd651dba86fd2db5f80704a 100644 (file)
--- a/include/clang/Lex/Preprocessor.h
+++ b/include/clang/Lex/Preprocessor.h
@@ -189,10 +189,6 @@ public:
   IdentifierTable &getIdentifierTable() { return Identifiers; }
   SelectorTable &getSelectorTable() { return Selectors; }
 
-  inline FullSourceLoc getFullLoc(SourceLocation Loc) const {
-    return FullSourceLoc(Loc, getSourceManager());
-  }
-  
   /// SetCommentRetentionState - Control whether or not the preprocessor retains
   /// comments in output.
   void SetCommentRetentionState(bool KeepComments, bool KeepMacroComments) {

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 5f8f3517feff4e4c70284f34c442a13cce2e3633..7a5174c82ffa2a29abddb226e53a6a1a28f7796b 100644 (file)
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -118,11 +118,12 @@ Preprocessor::~Preprocessor() {
 /// the specified Token's location, translating the token's start
 /// position in the current buffer into a SourcePosition object for rendering.
 DiagnosticBuilder Preprocessor::Diag(SourceLocation Loc, unsigned DiagID) {
-  return Diags.Report(getFullLoc(Loc), DiagID);
+  return Diags.Report(FullSourceLoc(Loc, getSourceManager()), DiagID);
 }
 
 DiagnosticBuilder Preprocessor::Diag(const Token &Tok, unsigned DiagID) {
-  return Diags.Report(getFullLoc(Tok.getLocation()), DiagID);
+  return Diags.Report(FullSourceLoc(Tok.getLocation(), getSourceManager()),
+                      DiagID);
 }
 
 void Preprocessor::DumpToken(const Token &Tok, bool DumpFlags) const {