diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-05-13 00:55:26 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-05-13 00:55:26 +0000 |
| commit | 9fc9e77c2fd15a88bd19ff3fdc9eb9716742f720 (patch) | |
| tree | 4b28e9426a6e845dd16d8062f3884cd4b49ac0bd /lib/Lex/PPMacroExpansion.cpp | |
| parent | 09d04e5097034d8dfb9fcfceb457f6924cdd2417 (diff) | |
When we expect two arguments but have zero, make sure to add
two empty arguments. Also, add an assert so that this bug
manifests as an assertion failure, not a valgrind problem.
This fixes rdar://6880648 - [cpp] crash in ArgNeedsPreexpansion
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71616 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PPMacroExpansion.cpp')
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 48c166daba..18dcfb25e7 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -427,6 +427,11 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, Tok.setLocation(EndLoc); Tok.setLength(0); ArgTokens.push_back(Tok); + + // If we expect two arguments, add both as empty. + if (NumActuals == 0 && MinArgsExpected == 2) + ArgTokens.push_back(Tok); + } else if (NumActuals > MinArgsExpected && !MI->isVariadic()) { // Emit the diagnostic at the macro name in case there is a missing ). // Emitting it at the , could be far away from the macro name. |