1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 5f8f3517fe..7a5174c82f 100644
--- 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 {