llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Kazu Hirata (kazutakahirata) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/127369.diff 1 Files Affected: - (modified) clang/lib/AST/ExternalASTMerger.cpp (+7-9) ``````````diff diff --git a/clang/lib/AST/ExternalASTMerger.cpp b/clang/lib/AST/ExternalASTMerger.cpp index 257e8338dedef..1c903b5104bf4 100644 --- a/clang/lib/AST/ExternalASTMerger.cpp +++ b/clang/lib/AST/ExternalASTMerger.cpp @@ -206,16 +206,14 @@ class LazyASTImporter : public ASTImporter { << "\n"; Source<DeclContext *> FromDC( cast<DeclContext>(From)->getPrimaryContext()); - if (FromOrigins.count(FromDC) && - Parent.HasImporterForOrigin(*FromOrigins.at(FromDC).AST)) { + if (auto It = FromOrigins.find(FromDC); + It != FromOrigins.end() && + Parent.HasImporterForOrigin(*It->second.AST)) { if (LoggingEnabled) - logs() << "(ExternalASTMerger*)" << (void*)&Parent - << " forced origin (DeclContext*)" - << (void*)FromOrigins.at(FromDC).DC - << ", (ASTContext*)" - << (void*)FromOrigins.at(FromDC).AST - << "\n"; - Parent.ForceRecordOrigin(ToDC, FromOrigins.at(FromDC)); + logs() << "(ExternalASTMerger*)" << (void *)&Parent + << " forced origin (DeclContext*)" << (void *)It->second.DC + << ", (ASTContext*)" << (void *)It->second.AST << "\n"; + Parent.ForceRecordOrigin(ToDC, It->second); } else { if (LoggingEnabled) logs() << "(ExternalASTMerger*)" << (void*)&Parent `````````` </details> https://github.com/llvm/llvm-project/pull/127369 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
