[libclang] Follow-up to r170824, provide the correct number of arguments for

a not-fully-formed macro invocation during code-completion.

llvm-svn: 170833

2 files changed, 12 insertions, 1 deletions

diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index a523612fbdb..b7ea30e83cf 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -619,6 +619,17 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName,
   // See MacroArgs instance var for description of this.
   bool isVarargsElided = false;
 
+  if (ContainsCodeCompletionTok) {
+    // Recover from not-fully-formed macro invocation during code-completion.
+    Token EOFTok;
+    EOFTok.startToken();
+    EOFTok.setKind(tok::eof);
+    EOFTok.setLocation(Tok.getLocation());
+    EOFTok.setLength(0);
+    for (; NumActuals < MinArgsExpected; ++NumActuals)
+      ArgTokens.push_back(EOFTok);
+  }
+
   if (NumActuals < MinArgsExpected) {
     // There are several cases where too few arguments is ok, handle them now.
     if (NumActuals == 0 && MinArgsExpected == 1) {
diff --git a/clang/test/Index/complete-macro-args.c b/clang/test/Index/complete-macro-args.c
index 2f3833d989e..62a42ffa217 100644
--- a/clang/test/Index/complete-macro-args.c
+++ b/clang/test/Index/complete-macro-args.c
@@ -12,7 +12,7 @@ void test(struct Point *p) {
   MACRO(p->x);
 }
 
-#define MACRO3(x,y,z) x
+#define MACRO3(x,y,z) x;y;z
 
 void test(struct Point *p) {
   MACRO3(p->x);