Skip to content

[cxx-interop] Improve performance of synthesized iterator conformances #84853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2025
Merged

[cxx-interop] Improve performance of synthesized iterator conformances #84853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions lib/ClangImporter/ClangDerivedConformances.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static ValueDecl *lookupOperator(NominalTypeDecl *decl, Identifier id,

// If no member operator was found, look for out-of-class definitions in the
// same module.
auto module = decl->getModuleContext();
auto module = decl->getModuleContextForNameLookup();
SmallVector<ValueDecl *> nonMemberResults;
module->lookupValue(id, NLKind::UnqualifiedLookup, nonMemberResults);
for (const auto &nonMember : nonMemberResults) {
Expand Down Expand Up @@ -273,8 +273,17 @@ instantiateTemplatedOperator(ClangImporter::Implementation &impl,
best)) {
case clang::OR_Success: {
if (auto clangCallee = best->Function) {
auto lookupTable = impl.findLookupTable(classDecl);
addEntryToLookupTable(*lookupTable, clangCallee, impl.getNameImporter());
// Declarations inside of a C++ namespace are added into two lookup
// tables: one for the __ObjC module, one for the actual owning Clang
// module of the decl. This is a hack that is meant to address the case
// when a namespace spans across multiple Clang modules. Mimic that
// behavior for the operator that we just instantiated.
auto lookupTable1 = impl.findLookupTable(classDecl);
addEntryToLookupTable(*lookupTable1, clangCallee, impl.getNameImporter());
auto owningModule = impl.getClangOwningModule(classDecl);
auto lookupTable2 = impl.findLookupTable(owningModule);
if (lookupTable1 != lookupTable2)
addEntryToLookupTable(*lookupTable2, clangCallee, impl.getNameImporter());
return clangCallee;
}
break;
Expand Down Expand Up @@ -377,8 +386,13 @@ static bool synthesizeCXXOperator(ClangImporter::Implementation &impl,
equalEqualDecl->setBody(equalEqualBody);

impl.synthesizedAndAlwaysVisibleDecls.insert(equalEqualDecl);
auto lookupTable = impl.findLookupTable(classDecl);
addEntryToLookupTable(*lookupTable, equalEqualDecl, impl.getNameImporter());
auto lookupTable1 = impl.findLookupTable(classDecl);
addEntryToLookupTable(*lookupTable1, equalEqualDecl, impl.getNameImporter());
auto owningModule = impl.getClangOwningModule(classDecl);
auto lookupTable2 = impl.findLookupTable(owningModule);
if (lookupTable1 != lookupTable2)
addEntryToLookupTable(*lookupTable2, equalEqualDecl,
impl.getNameImporter());
return true;
}

Expand Down