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

[preprocessor] Call the MacroUndefined callback even when the macro was not defined. 

Patch by Enea Zaffanella!

llvm-svn: 172623
This commit is contained in:
Argyrios Kyrtzidis 2013-01-16 16:52:44 +00:00
parent 395a7e5d35
commit 99b0a6a03a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Lex/PPDirectives.cpp
View File

@ -1967,16 +1967,17 @@ void Preprocessor::HandleUndefDirective(Token &UndefTok) {
// Okay, we finally have a valid identifier to undef.
MacroInfo *MI = getMacroInfo(MacroNameTok.getIdentifierInfo());
// If the callbacks want to know, tell them about the macro #undef.
// Note: no matter if the macro was defined or not.
if (Callbacks)
Callbacks->MacroUndefined(MacroNameTok, MI);
// If the macro is not defined, this is a noop undef, just return.
if (MI == 0) return;
if (!MI->isUsed() && MI->isWarnIfUnused())
Diag(MI->getDefinitionLoc(), diag::pp_macro_not_used);
// If the callbacks want to know, tell them about the macro #undef.
if (Callbacks)
Callbacks->MacroUndefined(MacroNameTok, MI);
if (MI->isWarnIfUnused())
WarnUnusedMacroLocs.erase(MI->getDefinitionLoc());

4
clang/lib/Lex/PreprocessingRecord.cpp
View File

@ -416,7 +416,9 @@ void PreprocessingRecord::MacroDefined(const Token &Id,
void PreprocessingRecord::MacroUndefined(const Token &Id,
const MacroInfo *MI) {
MacroDefinitions.erase(MI);
// Note: MI may be null (when #undef'ining an undefined macro).
if (MI)
MacroDefinitions.erase(MI);
}
void PreprocessingRecord::InclusionDirective(