[clang] Implement some missing interfaces for DelegatingDeserializationListener #133424
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-modules Author: Haojian Wu (hokein) ChangesSplit from the #133395 per the review comment. This patch also moves the Full diff: https://github.com/llvm/llvm-project/pull/133424.diff 2 Files Affected:
diff --git a/clang/include/clang/Serialization/ASTDeserializationListener.h b/clang/include/clang/Serialization/ASTDeserializationListener.h
index ea96faa07c191..a6abc1e694810 100644
--- a/clang/include/clang/Serialization/ASTDeserializationListener.h
+++ b/clang/include/clang/Serialization/ASTDeserializationListener.h
@@ -27,6 +27,8 @@ class MacroInfo;
class Module;
class SourceLocation;
+// IMPORTANT: when you add a new interface to this class, please update the
+// DelegatingDeserializationListener below.
class ASTDeserializationListener {
public:
virtual ~ASTDeserializationListener();
@@ -58,6 +60,70 @@ class ASTDeserializationListener {
virtual void ModuleImportRead(serialization::SubmoduleID ID,
SourceLocation ImportLoc) {}
};
-}
+
+class DelegatingDeserializationListener : public ASTDeserializationListener {
+ ASTDeserializationListener *Previous;
+ bool DeletePrevious;
+
+public:
+ explicit DelegatingDeserializationListener(
+ ASTDeserializationListener *Previous, bool DeletePrevious)
+ : Previous(Previous), DeletePrevious(DeletePrevious) {}
+ ~DelegatingDeserializationListener() override {
+ if (DeletePrevious)
+ delete Previous;
+ }
+
+ DelegatingDeserializationListener(const DelegatingDeserializationListener &) =
+ delete;
+ DelegatingDeserializationListener &
+ operator=(const DelegatingDeserializationListener &) = delete;
+
+ void ReaderInitialized(ASTReader *Reader) override {
+ if (Previous)
+ Previous->ReaderInitialized(Reader);
+ }
+ void IdentifierRead(serialization::IdentifierID ID,
+ IdentifierInfo *II) override {
+ if (Previous)
+ Previous->IdentifierRead(ID, II);
+ }
+ void MacroRead(serialization::MacroID ID, MacroInfo *MI) override {
+ if (Previous)
+ Previous->MacroRead(ID, MI);
+ }
+ void TypeRead(serialization::TypeIdx Idx, QualType T) override {
+ if (Previous)
+ Previous->TypeRead(Idx, T);
+ }
+ void DeclRead(GlobalDeclID ID, const Decl *D) override {
+ if (Previous)
+ Previous->DeclRead(ID, D);
+ }
+ void PredefinedDeclBuilt(PredefinedDeclIDs ID, const Decl *D) override {
+ if (Previous)
+ Previous->PredefinedDeclBuilt(ID, D);
+ }
+ void SelectorRead(serialization::SelectorID ID, Selector Sel) override {
+ if (Previous)
+ Previous->SelectorRead(ID, Sel);
+ }
+ void MacroDefinitionRead(serialization::PreprocessedEntityID PPID,
+ MacroDefinitionRecord *MD) override {
+ if (Previous)
+ Previous->MacroDefinitionRead(PPID, MD);
+ }
+ void ModuleRead(serialization::SubmoduleID ID, Module *Mod) override {
+ if (Previous)
+ Previous->ModuleRead(ID, Mod);
+ }
+ void ModuleImportRead(serialization::SubmoduleID ID,
+ SourceLocation ImportLoc) override {
+ if (Previous)
+ Previous->ModuleImportRead(ID, ImportLoc);
+ }
+};
+
+} // namespace clang
#endif
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp
index 9f789f093f55d..f6ad7c8dbd7ca 100644
--- a/clang/lib/Frontend/FrontendAction.cpp
+++ b/clang/lib/Frontend/FrontendAction.cpp
@@ -49,52 +49,6 @@ LLVM_INSTANTIATE_REGISTRY(FrontendPluginRegistry)
namespace {
-class DelegatingDeserializationListener : public ASTDeserializationListener {
- ASTDeserializationListener *Previous;
- bool DeletePrevious;
-
-public:
- explicit DelegatingDeserializationListener(
- ASTDeserializationListener *Previous, bool DeletePrevious)
- : Previous(Previous), DeletePrevious(DeletePrevious) {}
- ~DelegatingDeserializationListener() override {
- if (DeletePrevious)
- delete Previous;
- }
-
- DelegatingDeserializationListener(const DelegatingDeserializationListener &) =
- delete;
- DelegatingDeserializationListener &
- operator=(const DelegatingDeserializationListener &) = delete;
-
- void ReaderInitialized(ASTReader *Reader) override {
- if (Previous)
- Previous->ReaderInitialized(Reader);
- }
- void IdentifierRead(serialization::IdentifierID ID,
- IdentifierInfo *II) override {
- if (Previous)
- Previous->IdentifierRead(ID, II);
- }
- void TypeRead(serialization::TypeIdx Idx, QualType T) override {
- if (Previous)
- Previous->TypeRead(Idx, T);
- }
- void DeclRead(GlobalDeclID ID, const Decl *D) override {
- if (Previous)
- Previous->DeclRead(ID, D);
- }
- void SelectorRead(serialization::SelectorID ID, Selector Sel) override {
- if (Previous)
- Previous->SelectorRead(ID, Sel);
- }
- void MacroDefinitionRead(serialization::PreprocessedEntityID PPID,
- MacroDefinitionRecord *MD) override {
- if (Previous)
- Previous->MacroDefinitionRead(PPID, MD);
- }
-};
-
/// Dumps deserialized declarations.
class DeserializedDeclsDumper : public DelegatingDeserializationListener {
public:
|
|
@llvm/pr-subscribers-clang Author: Haojian Wu (hokein) ChangesSplit from the #133395 per the review comment. This patch also moves the Full diff: https://github.com/llvm/llvm-project/pull/133424.diff 2 Files Affected:
diff --git a/clang/include/clang/Serialization/ASTDeserializationListener.h b/clang/include/clang/Serialization/ASTDeserializationListener.h
index ea96faa07c191..a6abc1e694810 100644
--- a/clang/include/clang/Serialization/ASTDeserializationListener.h
+++ b/clang/include/clang/Serialization/ASTDeserializationListener.h
@@ -27,6 +27,8 @@ class MacroInfo;
class Module;
class SourceLocation;
+// IMPORTANT: when you add a new interface to this class, please update the
+// DelegatingDeserializationListener below.
class ASTDeserializationListener {
public:
virtual ~ASTDeserializationListener();
@@ -58,6 +60,70 @@ class ASTDeserializationListener {
virtual void ModuleImportRead(serialization::SubmoduleID ID,
SourceLocation ImportLoc) {}
};
-}
+
+class DelegatingDeserializationListener : public ASTDeserializationListener {
+ ASTDeserializationListener *Previous;
+ bool DeletePrevious;
+
+public:
+ explicit DelegatingDeserializationListener(
+ ASTDeserializationListener *Previous, bool DeletePrevious)
+ : Previous(Previous), DeletePrevious(DeletePrevious) {}
+ ~DelegatingDeserializationListener() override {
+ if (DeletePrevious)
+ delete Previous;
+ }
+
+ DelegatingDeserializationListener(const DelegatingDeserializationListener &) =
+ delete;
+ DelegatingDeserializationListener &
+ operator=(const DelegatingDeserializationListener &) = delete;
+
+ void ReaderInitialized(ASTReader *Reader) override {
+ if (Previous)
+ Previous->ReaderInitialized(Reader);
+ }
+ void IdentifierRead(serialization::IdentifierID ID,
+ IdentifierInfo *II) override {
+ if (Previous)
+ Previous->IdentifierRead(ID, II);
+ }
+ void MacroRead(serialization::MacroID ID, MacroInfo *MI) override {
+ if (Previous)
+ Previous->MacroRead(ID, MI);
+ }
+ void TypeRead(serialization::TypeIdx Idx, QualType T) override {
+ if (Previous)
+ Previous->TypeRead(Idx, T);
+ }
+ void DeclRead(GlobalDeclID ID, const Decl *D) override {
+ if (Previous)
+ Previous->DeclRead(ID, D);
+ }
+ void PredefinedDeclBuilt(PredefinedDeclIDs ID, const Decl *D) override {
+ if (Previous)
+ Previous->PredefinedDeclBuilt(ID, D);
+ }
+ void SelectorRead(serialization::SelectorID ID, Selector Sel) override {
+ if (Previous)
+ Previous->SelectorRead(ID, Sel);
+ }
+ void MacroDefinitionRead(serialization::PreprocessedEntityID PPID,
+ MacroDefinitionRecord *MD) override {
+ if (Previous)
+ Previous->MacroDefinitionRead(PPID, MD);
+ }
+ void ModuleRead(serialization::SubmoduleID ID, Module *Mod) override {
+ if (Previous)
+ Previous->ModuleRead(ID, Mod);
+ }
+ void ModuleImportRead(serialization::SubmoduleID ID,
+ SourceLocation ImportLoc) override {
+ if (Previous)
+ Previous->ModuleImportRead(ID, ImportLoc);
+ }
+};
+
+} // namespace clang
#endif
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp
index 9f789f093f55d..f6ad7c8dbd7ca 100644
--- a/clang/lib/Frontend/FrontendAction.cpp
+++ b/clang/lib/Frontend/FrontendAction.cpp
@@ -49,52 +49,6 @@ LLVM_INSTANTIATE_REGISTRY(FrontendPluginRegistry)
namespace {
-class DelegatingDeserializationListener : public ASTDeserializationListener {
- ASTDeserializationListener *Previous;
- bool DeletePrevious;
-
-public:
- explicit DelegatingDeserializationListener(
- ASTDeserializationListener *Previous, bool DeletePrevious)
- : Previous(Previous), DeletePrevious(DeletePrevious) {}
- ~DelegatingDeserializationListener() override {
- if (DeletePrevious)
- delete Previous;
- }
-
- DelegatingDeserializationListener(const DelegatingDeserializationListener &) =
- delete;
- DelegatingDeserializationListener &
- operator=(const DelegatingDeserializationListener &) = delete;
-
- void ReaderInitialized(ASTReader *Reader) override {
- if (Previous)
- Previous->ReaderInitialized(Reader);
- }
- void IdentifierRead(serialization::IdentifierID ID,
- IdentifierInfo *II) override {
- if (Previous)
- Previous->IdentifierRead(ID, II);
- }
- void TypeRead(serialization::TypeIdx Idx, QualType T) override {
- if (Previous)
- Previous->TypeRead(Idx, T);
- }
- void DeclRead(GlobalDeclID ID, const Decl *D) override {
- if (Previous)
- Previous->DeclRead(ID, D);
- }
- void SelectorRead(serialization::SelectorID ID, Selector Sel) override {
- if (Previous)
- Previous->SelectorRead(ID, Sel);
- }
- void MacroDefinitionRead(serialization::PreprocessedEntityID PPID,
- MacroDefinitionRecord *MD) override {
- if (Previous)
- Previous->MacroDefinitionRead(PPID, MD);
- }
-};
-
/// Dumps deserialized declarations.
class DeserializedDeclsDumper : public DelegatingDeserializationListener {
public:
|
…onListener This patch also moves the DelegatingDeserializationListener close to ASTDeserializationListener.
hokein
force-pushed
the
fix-delegat-deserialization
branch
from
b081c35 to
8eda833
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Split from the #133395 per the review comment.
This patch also moves the
DelegatingDeserializationListenerclose toASTDeserializationListener.