1 files changed, 9 insertions, 2 deletions
diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp
index 318c57cc5f2..f9f93867c85 100644
--- a/clang/lib/Lex/TokenLexer.cpp
+++ b/clang/lib/Lex/TokenLexer.cpp
@@ -471,9 +471,16 @@ bool TokenLexer::PasteTokens(Token &Tok) {
         }
       
         // Do not emit the warning when preprocessing assembler code.
-        if (!PP.getLangOptions().AsmPreprocessor)
-          PP.Diag(PasteOpLoc, diag::err_pp_bad_paste)
+        if (!PP.getLangOptions().AsmPreprocessor) {
+          // Explicitly convert the token location to have proper instantiation
+          // information so that the user knows where it came from.
+          SourceManager &SM = PP.getSourceManager();
+          SourceLocation Loc =
+            SM.createInstantiationLoc(PasteOpLoc, InstantiateLocStart,
+                                      InstantiateLocEnd, 2);
+          PP.Diag(Loc, diag::err_pp_bad_paste)
             << std::string(Buffer.begin(), Buffer.end());
+        }
         
         // Do not consume the RHS.
         --CurToken;