Michael137 updated this revision to Diff 551086. Michael137 added a comment.
- Reword commit message Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D158172/new/ https://reviews.llvm.org/D158172 Files: lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp Index: lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp =================================================================== --- lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp +++ lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp @@ -902,7 +902,6 @@ // We want that 'to' is actually complete after this function so let's // tell the ASTImporter that 'to' was imported from 'from'. MapImported(from, to); - ASTImporter::Imported(from, to); Log *log = GetLog(LLDBLog::Expressions); @@ -1028,7 +1027,7 @@ // Some decls shouldn't be tracked here because they were not created by // copying 'from' to 'to'. Just exit early for those. if (m_decls_to_ignore.count(to)) - return clang::ASTImporter::Imported(from, to); + return; // Transfer module ownership information. auto *from_source = llvm::dyn_cast_or_null<ClangExternalASTSourceCallbacks>( @@ -1081,12 +1080,6 @@ if (!to_context_md->hasOrigin(to) || user_id != LLDB_INVALID_UID) to_context_md->setOrigin(to, origin); - ImporterDelegateSP direct_completer = - m_main.GetDelegate(&to->getASTContext(), origin.ctx); - - if (direct_completer.get() != this) - direct_completer->ASTImporter::Imported(origin.decl, to); - LLDB_LOG(log, " [ClangASTImporter] Propagated origin " "(Decl*){0}/(ASTContext*){1} from (ASTContext*){2} to "
Index: lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp =================================================================== --- lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp +++ lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp @@ -902,7 +902,6 @@ // We want that 'to' is actually complete after this function so let's // tell the ASTImporter that 'to' was imported from 'from'. MapImported(from, to); - ASTImporter::Imported(from, to); Log *log = GetLog(LLDBLog::Expressions); @@ -1028,7 +1027,7 @@ // Some decls shouldn't be tracked here because they were not created by // copying 'from' to 'to'. Just exit early for those. if (m_decls_to_ignore.count(to)) - return clang::ASTImporter::Imported(from, to); + return; // Transfer module ownership information. auto *from_source = llvm::dyn_cast_or_null<ClangExternalASTSourceCallbacks>( @@ -1081,12 +1080,6 @@ if (!to_context_md->hasOrigin(to) || user_id != LLDB_INVALID_UID) to_context_md->setOrigin(to, origin); - ImporterDelegateSP direct_completer = - m_main.GetDelegate(&to->getASTContext(), origin.ctx); - - if (direct_completer.get() != this) - direct_completer->ASTImporter::Imported(origin.decl, to); - LLDB_LOG(log, " [ClangASTImporter] Propagated origin " "(Decl*){0}/(ASTContext*){1} from (ASTContext*){2} to "
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits