[libclang] Fix assertion hit when code-completing inside a function macro with more

arguments than it should accept.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175925 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 3e68fbdf011886df574ada159f79084b207c1b5e..99ab1346c030ef3d032e7c92a467a30e28d20bba 100644 (file)
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -620,8 +620,10 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName,
     EOFTok.setLength(0);
     ArgTokens.push_back(EOFTok);
     ++NumActuals;
-    assert(NumFixedArgsLeft != 0 && "Too many arguments parsed");
-    --NumFixedArgsLeft;
+    if (!ContainsCodeCompletionTok || NumFixedArgsLeft != 0) {
+      assert(NumFixedArgsLeft != 0 && "Too many arguments parsed");
+      --NumFixedArgsLeft;
+    }
   }
 
   // Okay, we either found the r_paren.  Check to see if we parsed too few

diff --git a/test/Index/complete-macro-args.c b/test/Index/complete-macro-args.c
index 0b4dd2073401b9432f424434af1e75b2fa26453a..250798470cb673f5e5fb8ee6728047e186c7d2bd 100644 (file)
--- a/test/Index/complete-macro-args.c
+++ b/test/Index/complete-macro-args.c
@@ -19,6 +19,11 @@ void test2(struct Point *p) {
   MACRO3(p->x
 }
 
+#define FM(x) x
+void test3(struct Point *p) {
+  FM(p->x, a);
+}
+
 #define VGM(...) 0
 #define VGM2(...) __VA_ARGS__
 
@@ -37,6 +42,7 @@ void test3(struct Point *p) {
 // RUN: c-index-test -code-completion-at=%s:12:12 %s | FileCheck %s
 // RUN: c-index-test -code-completion-at=%s:18:13 %s | FileCheck %s
 // RUN: c-index-test -code-completion-at=%s:19:13 %s | FileCheck %s
+// RUN: c-index-test -code-completion-at=%s:24:9 %s | FileCheck %s
 // CHECK:      FieldDecl:{ResultType float}{TypedText x} (35)
 // CHECK-NEXT: FieldDecl:{ResultType float}{TypedText y} (35)
 // CHECK-NEXT: FieldDecl:{ResultType float}{TypedText z} (35)
@@ -46,7 +52,7 @@ void test3(struct Point *p) {
 
 // With these, code-completion is unknown because the macro argument (and the
 // completion point) is not expanded by the macro definition.
-// RUN: c-index-test -code-completion-at=%s:28:15 %s -DEOF_TEST1 | FileCheck %s -check-prefix=CHECK-EOF
-// RUN: c-index-test -code-completion-at=%s:32:20 %s -DEOF_TEST2 | FileCheck %s -check-prefix=CHECK-EOF
+// RUN: c-index-test -code-completion-at=%s:33:15 %s -DEOF_TEST1 | FileCheck %s -check-prefix=CHECK-EOF
+// RUN: c-index-test -code-completion-at=%s:37:20 %s -DEOF_TEST2 | FileCheck %s -check-prefix=CHECK-EOF
 // CHECK-EOF: Completion contexts:
 // CHECK-EOF: Unknown