diff options
| -rw-r--r-- | clang/include/clang/AST/ASTImporter.h | 2 | ||||
| -rw-r--r-- | clang/lib/AST/ExternalASTMerger.cpp | 3 | ||||
| -rw-r--r-- | lldb/include/lldb/Symbol/ClangASTImporter.h | 2 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangASTImporter.cpp | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/clang/include/clang/AST/ASTImporter.h b/clang/include/clang/AST/ASTImporter.h index 7e0ed57f28e..8c73db0692e 100644 --- a/clang/include/clang/AST/ASTImporter.h +++ b/clang/include/clang/AST/ASTImporter.h @@ -425,7 +425,7 @@ class TypeSourceInfo; /// Subclasses can override this function to observe all of the \c From -> /// \c To declaration mappings as they are imported. - virtual Decl *Imported(Decl *From, Decl *To) { return To; } + virtual void Imported(Decl *From, Decl *To) {} /// Store and assign the imported declaration to its counterpart. Decl *MapImported(Decl *From, Decl *To); diff --git a/clang/lib/AST/ExternalASTMerger.cpp b/clang/lib/AST/ExternalASTMerger.cpp index d7cbf4dfd95..29911caa36b 100644 --- a/clang/lib/AST/ExternalASTMerger.cpp +++ b/clang/lib/AST/ExternalASTMerger.cpp @@ -110,7 +110,7 @@ public: /// Whenever a DeclContext is imported, ensure that ExternalASTSource's origin /// map is kept up to date. Also set the appropriate flags. - Decl *Imported(Decl *From, Decl *To) override { + void Imported(Decl *From, Decl *To) override { if (auto *ToDC = dyn_cast<DeclContext>(To)) { const bool LoggingEnabled = Parent.LoggingEnabled(); if (LoggingEnabled) @@ -153,7 +153,6 @@ public: ToContainer->getPrimaryContext()->setMustBuildLookupTable(); assert(Parent.CanComplete(ToContainer)); } - return To; } ASTImporter &GetReverse() { return Reverse; } }; diff --git a/lldb/include/lldb/Symbol/ClangASTImporter.h b/lldb/include/lldb/Symbol/ClangASTImporter.h index 65e4785a9f4..f374125b39b 100644 --- a/lldb/include/lldb/Symbol/ClangASTImporter.h +++ b/lldb/include/lldb/Symbol/ClangASTImporter.h @@ -262,7 +262,7 @@ private: void ImportDefinitionTo(clang::Decl *to, clang::Decl *from); - clang::Decl *Imported(clang::Decl *from, clang::Decl *to) override; + void Imported(clang::Decl *from, clang::Decl *to) override; clang::Decl *GetOriginalDecl(clang::Decl *To) override; diff --git a/lldb/source/Symbol/ClangASTImporter.cpp b/lldb/source/Symbol/ClangASTImporter.cpp index 96d9227cb5f..d4560e3d981 100644 --- a/lldb/source/Symbol/ClangASTImporter.cpp +++ b/lldb/source/Symbol/ClangASTImporter.cpp @@ -937,7 +937,7 @@ void ClangASTImporter::Minion::ImportDefinitionTo(clang::Decl *to, } } -clang::Decl *ClangASTImporter::Minion::Imported(clang::Decl *from, +void ClangASTImporter::Minion::Imported(clang::Decl *from, clang::Decl *to) { ClangASTMetrics::RegisterClangImport(); @@ -1096,8 +1096,6 @@ clang::Decl *ClangASTImporter::Minion::Imported(clang::Decl *from, } } } - - return clang::ASTImporter::Imported(from, to); } clang::Decl *ClangASTImporter::Minion::GetOriginalDecl(clang::Decl *To) { |
