diff options
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 11 | ||||
| -rw-r--r-- | test/Index/complete-macro-args.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index a523612fbd..b7ea30e83c 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/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/test/Index/complete-macro-args.c b/test/Index/complete-macro-args.c index 2f3833d989..62a42ffa21 100644 --- a/test/Index/complete-macro-args.c +++ b/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); |