diff options
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 6 | ||||
| -rw-r--r-- | test/Index/complete-macro-args.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 3e68fbdf01..99ab1346c0 100644 --- 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 0b4dd20734..250798470c 100644 --- 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 |