Skip to content

[ClangImporter] Import extern "C" declarations from the bridging header #73473

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
May 8, 2024
Merged

[ClangImporter] Import extern "C" declarations from the bridging header #73473

Show file tree
Hide file tree
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
21 changes: 17 additions & 4 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,11 +1686,24 @@ bool ClangImporter::Implementation::importHeader(

// We can't do this as we're parsing because we may want to resolve naming
// conflicts between the things we've parsed.
for (auto group : allParsedDecls)
for (auto *D : group)
if (auto named = dyn_cast<clang::NamedDecl>(D))
addEntryToLookupTable(*BridgingHeaderLookupTable, named,

std::function<void(clang::Decl *)> visit = [&](clang::Decl *decl) {
// Iterate into extern "C" {} type declarations.
if (auto linkageDecl = dyn_cast<clang::LinkageSpecDecl>(decl)) {
for (auto *decl : linkageDecl->noload_decls()) {
visit(decl);
}
}
if (auto named = dyn_cast<clang::NamedDecl>(decl)) {
addEntryToLookupTable(*BridgingHeaderLookupTable, named,
getNameImporter());
}
};
for (auto group : allParsedDecls) {
for (auto *D : group) {
visit(D);
}
}

pp.EndSourceFile();
bumpGeneration();
Expand Down
24 changes: 24 additions & 0 deletions test/SourceKit/CodeComplete/complete_extern_c_from_bridging_header.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// RUN: %empty-directory(%t)
// RUN: split-file --leading-lines %s %t

//--- Bridging-Header.h

void func_from_bridging_header(void);

extern "C"
void extern_c_func_from_bridging_header(void);

extern "C" {
extern "C" {
void nested_extern_c_func_from_bridging_header(void);
}
}

//--- test.swift

// Passes
// RUN: %sourcekitd-test -req=complete -pos 1:1 %t/test.swift -- %t/test.swift -import-bridging-header %t/Bridging-Header.h -cxx-interoperability-mode=default -pch-output-dir %t/pch-dir | %FileCheck %s
// RUN: %sourcekitd-test -req=complete -pos 1:1 %t/test.swift -- %t/test.swift -import-bridging-header %t/Bridging-Header.h -cxx-interoperability-mode=default | %FileCheck %s
// CHECK-DAG: func_from_bridging_header
// CHECK-DAG: extern_c_func_from_bridging_header
// CHECK-DAG: nested_extern_c_func_from_bridging_header