forked from OSchip/llvm-project
[NFC] Update function call names as changed in MacroInfo that should refer to Parameters (as opposed to Arguments).
This syncs them up with clang commit r308190 Thanks! llvm-svn: 308191
This commit is contained in:
parent
ac506d7494
commit
cb8e01acd0
|
@ -185,7 +185,7 @@ void MacroParenthesesPPCallbacks::argument(const Token &MacroNameTok,
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Only interested in macro arguments.
|
// Only interested in macro arguments.
|
||||||
if (MI->getArgumentNum(Tok.getIdentifierInfo()) < 0)
|
if (MI->getParameterNum(Tok.getIdentifierInfo()) < 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Argument is surrounded with parentheses/squares/braces/commas.
|
// Argument is surrounded with parentheses/squares/braces/commas.
|
||||||
|
|
|
@ -58,8 +58,8 @@ void MacroRepeatedPPCallbacks::MacroExpands(const Token &MacroNameTok,
|
||||||
}) != MI->tokens().end())
|
}) != MI->tokens().end())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (unsigned ArgNo = 0U; ArgNo < MI->getNumArgs(); ++ArgNo) {
|
for (unsigned ArgNo = 0U; ArgNo < MI->getNumParams(); ++ArgNo) {
|
||||||
const IdentifierInfo *Arg = *(MI->arg_begin() + ArgNo);
|
const IdentifierInfo *Arg = *(MI->param_begin() + ArgNo);
|
||||||
const Token *ResultArgToks = Args->getUnexpArgument(ArgNo);
|
const Token *ResultArgToks = Args->getUnexpArgument(ArgNo);
|
||||||
|
|
||||||
if (hasSideEffects(ResultArgToks) &&
|
if (hasSideEffects(ResultArgToks) &&
|
||||||
|
|
|
@ -407,7 +407,7 @@ static std::string getMacroExpandedString(clang::Preprocessor &PP,
|
||||||
// Walk over the macro Tokens.
|
// Walk over the macro Tokens.
|
||||||
for (const auto &T : MI->tokens()) {
|
for (const auto &T : MI->tokens()) {
|
||||||
clang::IdentifierInfo *II = T.getIdentifierInfo();
|
clang::IdentifierInfo *II = T.getIdentifierInfo();
|
||||||
int ArgNo = (II && Args ? MI->getArgumentNum(II) : -1);
|
int ArgNo = (II && Args ? MI->getParameterNum(II) : -1);
|
||||||
if (ArgNo == -1) {
|
if (ArgNo == -1) {
|
||||||
// This isn't an argument, just add it.
|
// This isn't an argument, just add it.
|
||||||
if (II == nullptr)
|
if (II == nullptr)
|
||||||
|
|
Loading…
Reference in New Issue