maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

arguments than it should accept.

llvm-svn: 175925
This commit is contained in:
Argyrios Kyrtzidis 2013-02-22 22:28:58 +00:00
parent 3f875c589f
commit fb70380f2f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -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

10
clang/test/Index/complete-macro-args.c
View File

@ -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