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

lib/Lex/TokenLexer.cpp

@@ -222,7 +222,7 @@ void TokenLexer::ExpandFunctionArguments() {
       
       // 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;
       }

test/Preprocessor/macro_paste_spacing2.c

@@ -0,0 +1,5 @@
+// RUN: clang-cc %s -E | grep "movl %eax"
+
+#define R1E %eax
+#define epilogue(r1) movl r1;
+epilogue(R1E)