Skip to content

[cxx-interop] Allow using non-resilient C++ symbols in resilient overlays #77897

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
Dec 3, 2024
Merged

[cxx-interop] Allow using non-resilient C++ symbols in resilient overlays #77897

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
4 changes: 4 additions & 0 deletions lib/Sema/TypeCheckAccess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,6 +2002,10 @@ swift::getDisallowedOriginKind(const Decl *decl,
if (SF->getASTContext().LangOpts.EnableCXXInterop && where.getDeclContext() &&
where.getDeclContext()->getAsDecl() &&
where.getDeclContext()->getAsDecl()->getModuleContext()->isResilient() &&
!where.getDeclContext()
->getAsDecl()
->getModuleContext()
->getUnderlyingModuleIfOverlay() &&
decl->hasClangNode() && !decl->getModuleContext()->isSwiftShimsModule() &&
isFragileClangNode(decl->getClangNode()) &&
!SF->getASTContext().LangOpts.hasFeature(
Expand Down
1 change: 0 additions & 1 deletion stdlib/public/Cxx/std/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ add_swift_target_library(swiftCxxStdlib STATIC NO_LINK_NAME IS_STDLIB IS_SWIFT_O
SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-cxx-interoperability-mode=default
-Xfrontend -module-interface-preserve-types-as-written
-enable-experimental-feature AssumeResilientCxxTypes

# The varying modularization of the C++ standard library on different
# platforms makes it difficult to enable MemberImportVisibility for this
Expand Down