Skip to content

[ClangImporter] Do not import function decl if already imported via type signature #85480

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[ClangImporter] Do not import function decl if already imported via type signature #85480

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
11 changes: 9 additions & 2 deletions lib/ClangImporter/ImportDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3828,8 +3828,8 @@ namespace {
if (!dc)
return nullptr;

// We may have already imported this function decl before we imported the
// parent record. In such a case it's important we don't re-import.
// We may have already imported this function decl while importing its
// decl context. Check decl cache to make sure we don't import twice.
auto known = Impl.ImportedDecls.find({decl, getVersion()});
if (known != Impl.ImportedDecls.end()) {
return known->second;
Expand Down Expand Up @@ -4006,6 +4006,13 @@ namespace {
return nullptr;
}

// We may have already imported this function decl while importing its
// type signature. Check decl cache to make sure we don't import twice.
auto known2 = Impl.ImportedDecls.find({decl, getVersion()});
if (known2 != Impl.ImportedDecls.end()) {
return known2->second;
}

if (name && name.isSimpleName()) {
assert(importedName.hasCustomName() &&
"imported function with simple name?");
Expand Down