From 313bd3bb2cfec5729b5da4b3a27e0f96c6ab0d06 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Wed, 26 Apr 2017 20:58:19 +0000 Subject: [PATCH] Revert "PPCallbacks::MacroUndefined, change signature and add test." This reverts commit r301449. It breaks the build with: MacroPPCallbacks.h:114:50: error: non-virtual member function marked 'override' hides virtual member function git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@301469 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Lex/PPCallbacks.h | 16 ++--- include/clang/Lex/PreprocessingRecord.h | 3 +- lib/Frontend/PrintPreprocessedOutput.cpp | 6 +- lib/Lex/PPDirectives.cpp | 29 +++++----- lib/Lex/PreprocessingRecord.cpp | 3 +- tools/libclang/Indexing.cpp | 3 +- unittests/Basic/SourceManagerTest.cpp | 74 +++++++----------------- 7 files changed, 46 insertions(+), 88 deletions(-) diff --git a/include/clang/Lex/PPCallbacks.h b/include/clang/Lex/PPCallbacks.h index 57fe1bb122..2d027f314b 100644 --- a/include/clang/Lex/PPCallbacks.h +++ b/include/clang/Lex/PPCallbacks.h @@ -247,14 +247,10 @@ public: } /// \brief Hook called whenever a macro \#undef is seen. - /// \param Token The active Token - /// \param MD A MacroDefinition for the named macro. - /// \param Undef New MacroDirective if the macro was defined, null otherwise. /// /// MD is released immediately following this callback. virtual void MacroUndefined(const Token &MacroNameTok, - const MacroDefinition &MD, - const MacroDirective *Undef) { + const MacroDefinition &MD) { } /// \brief Hook called whenever the 'defined' operator is seen. @@ -443,17 +439,15 @@ public: Second->MacroExpands(MacroNameTok, MD, Range, Args); } - void MacroDefined(const Token &MacroNameTok, - const MacroDirective *MD) override { + void MacroDefined(const Token &MacroNameTok, const MacroDirective *MD) override { First->MacroDefined(MacroNameTok, MD); Second->MacroDefined(MacroNameTok, MD); } void MacroUndefined(const Token &MacroNameTok, - const MacroDefinition &MD, - const MacroDirective *Undef) override { - First->MacroUndefined(MacroNameTok, MD, Undef); - Second->MacroUndefined(MacroNameTok, MD, Undef); + const MacroDefinition &MD) override { + First->MacroUndefined(MacroNameTok, MD); + Second->MacroUndefined(MacroNameTok, MD); } void Defined(const Token &MacroNameTok, const MacroDefinition &MD, diff --git a/include/clang/Lex/PreprocessingRecord.h b/include/clang/Lex/PreprocessingRecord.h index fc2c507004..826ba33fbb 100644 --- a/include/clang/Lex/PreprocessingRecord.h +++ b/include/clang/Lex/PreprocessingRecord.h @@ -488,8 +488,7 @@ namespace clang { void MacroExpands(const Token &Id, const MacroDefinition &MD, SourceRange Range, const MacroArgs *Args) override; void MacroDefined(const Token &Id, const MacroDirective *MD) override; - void MacroUndefined(const Token &Id, const MacroDefinition &MD, - const MacroDirective *Undef) override; + void MacroUndefined(const Token &Id, const MacroDefinition &MD) override; void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName, bool IsAngled, CharSourceRange FilenameRange, diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp index 3168b3da70..d48b952ef2 100644 --- a/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/lib/Frontend/PrintPreprocessedOutput.cpp @@ -172,8 +172,7 @@ public: /// MacroUndefined - This hook is called whenever a macro #undef is seen. void MacroUndefined(const Token &MacroNameTok, - const MacroDefinition &MD, - const MacroDirective *Undef) override; + const MacroDefinition &MD) override; }; } // end anonymous namespace @@ -390,8 +389,7 @@ void PrintPPOutputPPCallbacks::MacroDefined(const Token &MacroNameTok, } void PrintPPOutputPPCallbacks::MacroUndefined(const Token &MacroNameTok, - const MacroDefinition &MD, - const MacroDirective *Undef) { + const MacroDefinition &MD) { // Only print out macro definitions in -dD mode. if (!DumpDefines) return; diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index fd4e6d30de..8a56ddf236 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -2592,26 +2592,25 @@ void Preprocessor::HandleUndefDirective() { // Okay, we have a valid identifier to undef. auto *II = MacroNameTok.getIdentifierInfo(); auto MD = getMacroDefinition(II); - UndefMacroDirective *Undef = nullptr; - - // If the macro is not defined, this is a noop undef. - if (const MacroInfo *MI = MD.getMacroInfo()) { - if (!MI->isUsed() && MI->isWarnIfUnused()) - Diag(MI->getDefinitionLoc(), diag::pp_macro_not_used); - - if (MI->isWarnIfUnused()) - WarnUnusedMacroLocs.erase(MI->getDefinitionLoc()); - - Undef = AllocateUndefMacroDirective(MacroNameTok.getLocation()); - } // 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, MD, Undef); + Callbacks->MacroUndefined(MacroNameTok, MD); + + // If the macro is not defined, this is a noop undef, just return. + const MacroInfo *MI = MD.getMacroInfo(); + if (!MI) + return; + + if (!MI->isUsed() && MI->isWarnIfUnused()) + Diag(MI->getDefinitionLoc(), diag::pp_macro_not_used); + + if (MI->isWarnIfUnused()) + WarnUnusedMacroLocs.erase(MI->getDefinitionLoc()); - if (Undef) - appendMacroDirective(II, Undef); + appendMacroDirective(MacroNameTok.getIdentifierInfo(), + AllocateUndefMacroDirective(MacroNameTok.getLocation())); } //===----------------------------------------------------------------------===// diff --git a/lib/Lex/PreprocessingRecord.cpp b/lib/Lex/PreprocessingRecord.cpp index 03c4cbe589..13e15f3c94 100644 --- a/lib/Lex/PreprocessingRecord.cpp +++ b/lib/Lex/PreprocessingRecord.cpp @@ -422,8 +422,7 @@ void PreprocessingRecord::MacroDefined(const Token &Id, } void PreprocessingRecord::MacroUndefined(const Token &Id, - const MacroDefinition &MD, - const MacroDirective *Undef) { + const MacroDefinition &MD) { MD.forAllDefinitions([&](MacroInfo *MI) { MacroDefinitions.erase(MI); }); } diff --git a/tools/libclang/Indexing.cpp b/tools/libclang/Indexing.cpp index 5312b7c016..f98b258879 100644 --- a/tools/libclang/Indexing.cpp +++ b/tools/libclang/Indexing.cpp @@ -262,8 +262,7 @@ public: /// MacroUndefined - This hook is called whenever a macro #undef is seen. /// MI is released immediately following this callback. void MacroUndefined(const Token &MacroNameTok, - const MacroDefinition &MD, - const MacroDirective *UD) override {} + const MacroDefinition &MD) override {} /// MacroExpands - This is called by when a macro invocation is found. void MacroExpands(const Token &MacroNameTok, const MacroDefinition &MD, diff --git a/unittests/Basic/SourceManagerTest.cpp b/unittests/Basic/SourceManagerTest.cpp index aa15e16b85..dddc3f9866 100644 --- a/unittests/Basic/SourceManagerTest.cpp +++ b/unittests/Basic/SourceManagerTest.cpp @@ -249,18 +249,12 @@ TEST_F(SourceManagerTest, getMacroArgExpandedLocation) { namespace { struct MacroAction { - enum Kind { kExpansion, kDefinition, kUnDefinition}; - SourceLocation Loc; std::string Name; - unsigned MAKind : 3; - - MacroAction(SourceLocation Loc, StringRef Name, unsigned K) - : Loc(Loc), Name(Name), MAKind(K) { } - - bool isExpansion() const { return MAKind == kExpansion; } - bool isDefinition() const { return MAKind & kDefinition; } - bool isUnDefinition() const { return MAKind & kUnDefinition; } + bool isDefinition; // if false, it is expansion. + + MacroAction(SourceLocation Loc, StringRef Name, bool isDefinition) + : Loc(Loc), Name(Name), isDefinition(isDefinition) { } }; class MacroTracker : public PPCallbacks { @@ -273,22 +267,13 @@ public: const MacroDirective *MD) override { Macros.push_back(MacroAction(MD->getLocation(), MacroNameTok.getIdentifierInfo()->getName(), - MacroAction::kDefinition)); - } - void MacroUndefined(const Token &MacroNameTok, - const MacroDefinition &MD, - const MacroDirective *UD) override { - Macros.push_back( - MacroAction(UD ? UD->getLocation() : SourceLocation(), - MacroNameTok.getIdentifierInfo()->getName(), - UD ? MacroAction::kDefinition | MacroAction::kUnDefinition - : MacroAction::kUnDefinition)); + true)); } void MacroExpands(const Token &MacroNameTok, const MacroDefinition &MD, SourceRange Range, const MacroArgs *Args) override { Macros.push_back(MacroAction(MacroNameTok.getLocation(), MacroNameTok.getIdentifierInfo()->getName(), - MacroAction::kExpansion)); + false)); } }; @@ -296,10 +281,7 @@ public: TEST_F(SourceManagerTest, isBeforeInTranslationUnitWithMacroInInclude) { const char *header = - "#define MACRO_IN_INCLUDE 0\n" - "#define MACRO_DEFINED\n" - "#undef MACRO_DEFINED\n" - "#undef MACRO_UNDEFINED\n"; + "#define MACRO_IN_INCLUDE 0\n"; const char *main = "#define M(x) x\n" @@ -345,46 +327,34 @@ TEST_F(SourceManagerTest, isBeforeInTranslationUnitWithMacroInInclude) { // Make sure we got the tokens that we expected. ASSERT_EQ(0U, toks.size()); - ASSERT_EQ(15U, Macros.size()); + ASSERT_EQ(9U, Macros.size()); // #define M(x) x - ASSERT_TRUE(Macros[0].isDefinition()); + ASSERT_TRUE(Macros[0].isDefinition); ASSERT_EQ("M", Macros[0].Name); // #define INC "/test-header.h" - ASSERT_TRUE(Macros[1].isDefinition()); + ASSERT_TRUE(Macros[1].isDefinition); ASSERT_EQ("INC", Macros[1].Name); // M expansion in #include M(INC) - ASSERT_FALSE(Macros[2].isDefinition()); + ASSERT_FALSE(Macros[2].isDefinition); ASSERT_EQ("M", Macros[2].Name); // INC expansion in #include M(INC) - ASSERT_TRUE(Macros[3].isExpansion()); + ASSERT_FALSE(Macros[3].isDefinition); ASSERT_EQ("INC", Macros[3].Name); // #define MACRO_IN_INCLUDE 0 - ASSERT_TRUE(Macros[4].isDefinition()); + ASSERT_TRUE(Macros[4].isDefinition); ASSERT_EQ("MACRO_IN_INCLUDE", Macros[4].Name); - // #define MACRO_DEFINED - ASSERT_TRUE(Macros[5].isDefinition()); - ASSERT_FALSE(Macros[5].isUnDefinition()); - ASSERT_EQ("MACRO_DEFINED", Macros[5].Name); - // #undef MACRO_DEFINED - ASSERT_TRUE(Macros[6].isDefinition()); - ASSERT_TRUE(Macros[6].isUnDefinition()); - ASSERT_EQ("MACRO_DEFINED", Macros[6].Name); - // #undef MACRO_UNDEFINED - ASSERT_FALSE(Macros[7].isDefinition()); - ASSERT_TRUE(Macros[7].isUnDefinition()); - ASSERT_EQ("MACRO_UNDEFINED", Macros[7].Name); // #define INC2 - ASSERT_TRUE(Macros[8].isDefinition()); - ASSERT_EQ("INC2", Macros[8].Name); + ASSERT_TRUE(Macros[5].isDefinition); + ASSERT_EQ("INC2", Macros[5].Name); // M expansion in #include M(INC2) - ASSERT_FALSE(Macros[9].isDefinition()); - ASSERT_EQ("M", Macros[9].Name); + ASSERT_FALSE(Macros[6].isDefinition); + ASSERT_EQ("M", Macros[6].Name); // INC2 expansion in #include M(INC2) - ASSERT_TRUE(Macros[10].isExpansion()); - ASSERT_EQ("INC2", Macros[10].Name); + ASSERT_FALSE(Macros[7].isDefinition); + ASSERT_EQ("INC2", Macros[7].Name); // #define MACRO_IN_INCLUDE 0 - ASSERT_TRUE(Macros[11].isDefinition()); - ASSERT_EQ("MACRO_IN_INCLUDE", Macros[11].Name); + ASSERT_TRUE(Macros[8].isDefinition); + ASSERT_EQ("MACRO_IN_INCLUDE", Macros[8].Name); // The INC expansion in #include M(INC) comes before the first // MACRO_IN_INCLUDE definition of the included file. @@ -392,7 +362,7 @@ TEST_F(SourceManagerTest, isBeforeInTranslationUnitWithMacroInInclude) { // The INC2 expansion in #include M(INC2) comes before the second // MACRO_IN_INCLUDE definition of the included file. - EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(Macros[10].Loc, Macros[11].Loc)); + EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(Macros[7].Loc, Macros[8].Loc)); } #endif -- 2.40.0