Fix for PR4132: make sure to insert whitespace consistently before a
pasted token.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70793 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index da85a98..af56af6 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -222,7 +222,7 @@
// If the next token was supposed to get leading whitespace, ensure it has
// it now.
- if (NextTokGetsSpace) {
+ if (CurTok.hasLeadingSpace() || NextTokGetsSpace) {
ResultToks[ResultToks.size()-NumToks].setFlag(Token::LeadingSpace);
NextTokGetsSpace = false;
}