diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 9 | ||||
| -rw-r--r-- | lib/Lex/PreprocessingRecord.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 6796f1c21b..bdca03637d 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -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()); diff --git a/lib/Lex/PreprocessingRecord.cpp b/lib/Lex/PreprocessingRecord.cpp index 8e8afeb4b7..d7ebeafdf9 100644 --- a/lib/Lex/PreprocessingRecord.cpp +++ b/lib/Lex/PreprocessingRecord.cpp @@ -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( |