Skip to content

[6.2][cxx-interop] Fix a crash when exposing @objc Swift classes #82760

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
Xazax-hun merged 1 commit into from
Jul 3, 2025
Merged

[6.2][cxx-interop] Fix a crash when exposing @objc Swift classes #82760

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
3 changes: 2 additions & 1 deletion lib/PrintAsClang/ModuleContentsWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,8 @@ class ModuleWriter {
else if (isa<StructDecl>(TD) && NTD->hasClangNode())
emitReferencedClangTypeMetadata(NTD);
else if (const auto *cd = dyn_cast<ClassDecl>(TD))
if (cd->isObjC() || cd->isForeignReferenceType())
if ((cd->isObjC() && cd->getClangDecl()) ||
cd->isForeignReferenceType())
emitReferencedClangTypeMetadata(NTD);
} else if (auto TAD = dyn_cast<TypeAliasDecl>(TD)) {
if (TAD->hasClangNode())
Expand Down
9 changes: 8 additions & 1 deletion test/Interop/ObjCToSwiftToObjCxx/bridge-objc-types-back-to-objcxx.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,17 @@ public func retObjCClassArray() -> [ObjCKlass] {
return []
}

public class KVOCookieMonster {
public static func += (lhs: KVOCookieMonster, rhs: NSKeyValueObservation) {
lhs.cookies.append(rhs)
}

private var cookies = Array<NSKeyValueObservation>()
}

// CHECK: @interface HasBlockField : NSObject
// CHECK: @property (nonatomic, copy) void (^ _Nullable foo)(ObjCKlassState);
// CHECK: @end

// CHECK: SWIFT_EXTERN id <ObjCProtocol> _Nonnull $s9UseObjCTy03retB9CProtocolSo0bE0_pyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // retObjCProtocol()
// CHECK-NEXT: #endif
// CHECK-NEXT: #if defined(__OBJC__)
Expand Down