averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
rdar://154252454
This commit is contained in:
Gabor Horvath
2025-07-01 15:59:10 +01:00
parent 5a6a147850
commit 201e9b437c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/PrintAsClang/ModuleContentsWriter.cpp
View File

@@ -596,7 +596,8 @@ public:
else if (isa<StructDecl>(TD) && NTD->hasClangNode()) else if (isa<StructDecl>(TD) && NTD->hasClangNode())
emitReferencedClangTypeMetadata(NTD); emitReferencedClangTypeMetadata(NTD);
else if (const auto *cd = dyn_cast<ClassDecl>(TD)) else if (const auto *cd = dyn_cast<ClassDecl>(TD))
if (cd->isObjC() || cd->isForeignReferenceType()) if ((cd->isObjC() && cd->getClangDecl()) ||
cd->isForeignReferenceType())
emitReferencedClangTypeMetadata(NTD); emitReferencedClangTypeMetadata(NTD);
} else if (auto TAD = dyn_cast<TypeAliasDecl>(TD)) { } else if (auto TAD = dyn_cast<TypeAliasDecl>(TD)) {
if (TAD->hasClangNode()) if (TAD->hasClangNode())

9
test/Interop/ObjCToSwiftToObjCxx/bridge-objc-types-back-to-objcxx.swift
View File

@@ -88,10 +88,17 @@ public func retObjCClassArray() -> [ObjCKlass] {
return [] 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: @interface HasBlockField : NSObject
// CHECK: @property (nonatomic, copy) void (^ _Nullable foo)(ObjCKlassState); // CHECK: @property (nonatomic, copy) void (^ _Nullable foo)(ObjCKlassState);
// CHECK: @end // CHECK: @end
// CHECK: SWIFT_EXTERN id <ObjCProtocol> _Nonnull $s9UseObjCTy03retB9CProtocolSo0bE0_pyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // retObjCProtocol() // CHECK: SWIFT_EXTERN id <ObjCProtocol> _Nonnull $s9UseObjCTy03retB9CProtocolSo0bE0_pyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // retObjCProtocol()
// CHECK-NEXT: #endif // CHECK-NEXT: #endif
// CHECK-NEXT: #if defined(__OBJC__) // CHECK-NEXT: #if defined(__OBJC__)