Add IMPLICIT_BRIDGING for autorelease (#136)

Kyle-Ye · web-flow · commit e32d95d42bf2 · 2025-07-27T11:29:11.000+08:00
* Add IMPLICIT_BRIDGING for autorelease

* Bypass Subgraph.currentGraphContext retain crash
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/OpenGraph/Runtime/Metadata.swift b/Sources/OpenGraph/Runtime/Metadata.swift
@@ -40,7 +40,7 @@ extension Metadata: Swift.Hashable, Swift.CustomStringConvertible {
     @inline(__always)
     public var description: String {
         #if canImport(ObjectiveC)
-        __OGTypeDescription(self).takeUnretainedValue() as NSString as String
+        __OGTypeDescription(self) as NSString as String
         #else
         fatalError("Unimplemented")
         #endif
diff --git a/Sources/OpenGraphShims/Graph+Debug.swift b/Sources/OpenGraphShims/Graph+Debug.swift
@@ -13,7 +13,7 @@ extension Graph {
         guard let description = Graph.description(nil, options: options) else {
             return nil
         }
-        guard let dictionary = description.takeUnretainedValue() as? NSDictionary else {
+        guard let dictionary = description as? NSDictionary else {
             return nil
         }
         return dictionary as? [String: Any]
@@ -30,7 +30,7 @@ extension Graph {
         else {
             return nil
         }
-        return description.takeUnretainedValue() as? String
+        return description as? String
     }
 }
 
diff --git a/Sources/OpenGraph_SPI/Graph/GraphDescription.mm b/Sources/OpenGraph_SPI/Graph/GraphDescription.mm
@@ -12,7 +12,7 @@
 
 #if OG_OBJC_FOUNDATION
 #include <Foundation/Foundation.h>
-CFStringRef OGDescriptionFormat = CFSTR("format");
+const CFStringRef OGDescriptionFormat = CFSTR("format");
 
 CFTypeRef OG::Graph::description(const Graph * _Nullable graph, NSDictionary* dic) {
     // TODO
diff --git a/Sources/OpenGraph_SPI/include/OGComparison.h b/Sources/OpenGraph_SPI/include/OGComparison.h
@@ -35,6 +35,8 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 OG_EXTERN_C_BEGIN
 
 typedef struct OGFieldRange {
@@ -98,6 +100,8 @@ void OGOverrideComparisonForTypeDescriptor(void *descriptor, OGComparisonMode mo
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGComparison_h */
diff --git a/Sources/OpenGraph_SPI/include/OGDebugServer.h b/Sources/OpenGraph_SPI/include/OGDebugServer.h
@@ -11,6 +11,8 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 typedef struct OGDebugServerStorage OGDebugServerStorage;
 
 typedef const OGDebugServerStorage *OGDebugServer OG_SWIFT_STRUCT;
@@ -28,6 +30,8 @@ OG_EXPORT
 void OGDebugServerRun(int timeout) OG_SWIFT_NAME(OGDebugServer.run(timeout:));
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif
diff --git a/Sources/OpenGraph_SPI/include/OGGraph.h b/Sources/OpenGraph_SPI/include/OGGraph.h
@@ -23,6 +23,8 @@ typedef uint32_t OGAttribute OG_SWIFT_STRUCT OG_SWIFT_NAME(AnyAttribute);
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 // MARK: - Exported C functions
 
 OG_EXTERN_C_BEGIN
@@ -118,6 +120,8 @@ bool OGGraphAnyInputsChanged(const OGAttribute *inputs, size_t count);
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGGraph_h */
diff --git a/Sources/OpenGraph_SPI/include/OGGraphContext.h b/Sources/OpenGraph_SPI/include/OGGraphContext.h
@@ -12,6 +12,8 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 OG_EXTERN_C_BEGIN
 
 OG_EXPORT
@@ -20,6 +22,8 @@ OGGraphRef OGGraphContextGetGraph(OGGraphContextRef context) OG_SWIFT_NAME(gette
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGGraphContext_h */
diff --git a/Sources/OpenGraph_SPI/include/OGGraphDescription.h b/Sources/OpenGraph_SPI/include/OGGraphDescription.h
@@ -9,13 +9,21 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
-#if OG_OBJC_FOUNDATION
+OG_IMPLICIT_BRIDGING_ENABLED
+
 OG_EXTERN_C_BEGIN
+
+#if OG_OBJC_FOUNDATION
+
 OG_EXPORT
-CFStringRef OGDescriptionFormat OG_SWIFT_NAME(OGGraphRef.descriptionFormat);
-OG_EXTERN_C_END
+const CFStringRef OGDescriptionFormat OG_SWIFT_NAME(OGGraphRef.descriptionFormat);
+
 #endif
 
+OG_EXTERN_C_END
+
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGGraphDescription_h */
diff --git a/Sources/OpenGraph_SPI/include/OGGraphTracing.h b/Sources/OpenGraph_SPI/include/OGGraphTracing.h
@@ -16,6 +16,8 @@ typedef OG_OPTIONS(uint32_t, OGGraphTraceFlags) {
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 OG_EXTERN_C_BEGIN
 
 OG_EXPORT
@@ -32,6 +34,8 @@ void OGGraphStopTracing(_Nullable OGGraphRef graph) OG_SWIFT_NAME(OGGraphRef.sto
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGGraphTracing_hpp */
diff --git a/Sources/OpenGraph_SPI/include/OGSubgraph.h b/Sources/OpenGraph_SPI/include/OGSubgraph.h
@@ -14,6 +14,8 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 // MARK: - Exported C functions
 
 OG_EXTERN_C_BEGIN
@@ -109,6 +111,8 @@ void OGSubgraphEndTreeElement(OGAttribute attribute);
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGSubgraph_h */
diff --git a/Sources/OpenGraph_SPI/include/OGTupleType.h b/Sources/OpenGraph_SPI/include/OGTupleType.h
@@ -13,6 +13,8 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 typedef const OGSwiftMetadata *OGTupleType OG_SWIFT_STRUCT OG_SWIFT_NAME(TupleType);
 
 typedef OG_CLOSED_ENUM(uint32_t, OGTupleCopyOptions) {
@@ -84,6 +86,8 @@ void OGTupleWithBuffer(OGTupleType tuple_type, size_t count, const void (* funct
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGTupleType_h */
diff --git a/Sources/OpenGraph_SPI/include/OGTypeID.h b/Sources/OpenGraph_SPI/include/OGTypeID.h
@@ -13,6 +13,8 @@
 
 OG_ASSUME_NONNULL_BEGIN
 
+OG_IMPLICIT_BRIDGING_ENABLED
+
 typedef struct OG_SWIFT_NAME(_Metadata) OGSwiftMetadata {
 } OGSwiftMetadata;
 
@@ -114,6 +116,8 @@ char const* _Nullable OGTypeNominalDescriptorName(OGTypeID typeID) OG_SWIFT_NAME
 
 OG_EXTERN_C_END
 
+OG_IMPLICIT_BRIDGING_DISABLED
+
 OG_ASSUME_NONNULL_END
 
 #endif /* OGTypeID_h */
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Weak/OGWeakAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Weak/OGWeakAttributeTests.swift
@@ -5,6 +5,8 @@
 import Testing
 
 #if canImport(Darwin)
+
+@Suite(.enabled(if: compatibilityTestEnabled))
 final class AnyWeakAttributeTests: AttributeTestBase {
     @Test
     func basic() {
diff --git a/Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeTests.swift b/Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeTests.swift
@@ -4,8 +4,8 @@
 
 import Testing
 
-// *** Program crashed: Bad pointer dereference at 0x00000007eff1c01b ***
 #if canImport(Darwin)
+@Suite(.enabled(if: compatibilityTestEnabled))
 final class WeakAttributeTests: AttributeTestBase {
     @Test
     func initTest() {
diff --git a/Tests/OpenGraphCompatibilityTests/Debug/DebugServerTests.swift b/Tests/OpenGraphCompatibilityTests/Debug/DebugServerTests.swift
@@ -1,8 +1,6 @@
 //
 //  DebugServerTests.swift
-//
-//
-//
+//  OpenGraphCompatibilityTests
 
 #if canImport(Darwin)
 import CoreFoundation
@@ -22,12 +20,11 @@ struct DebugServerTests {
     // Or we can disable SIP on the target darwinOS and run `sudo sysctl kern.osvariant_status=xx` to workaround
     @Test(
         .disabled(if: compatibilityTestEnabled, "Skip on AG due to internal_diagnostics check"),
-        .disabled(if: !compatibilityTestEnabled, "Skip on OG due to OGReference crash on CLI test")
     )
     func testMode1() throws {
         _ = try #require(OGDebugServer.start(mode: 1))
         let url = try #require(OGDebugServer.copyURL())
-        let urlString = (url.takeRetainedValue() as URL).absoluteString
+        let urlString = (url as URL).absoluteString
         #expect(urlString.hasPrefix("graph://"))
         OGDebugServer.run(timeout: 1)
     }
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift
@@ -8,7 +8,7 @@ import Testing
 struct GraphDescriptionTests {
     @Test
     func format() {
-        #expect(Graph.descriptionFormat.takeUnretainedValue() as String == "format")
+        #expect(Graph.descriptionFormat as String == "format")
     }
 }
 #endif
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/GraphTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/GraphTests.swift
@@ -41,7 +41,7 @@ struct GraphTests {
     @Test(.disabled(if: !compatibilityTestEnabled, "Not implemented on OG"))
     func graphDescriptionDict() throws {
         let description = try #require(Graph.description(nil, options: ["format": "graph/dict"] as NSDictionary))
-        let dic = description.takeUnretainedValue() as! Dictionary<String, AnyHashable>
+        let dic = description as! Dictionary<String, AnyHashable>
         #expect(dic["version"] as? UInt32 == 2)
         #expect((dic["graphs"] as? NSArray)?.count == 0)
     }
@@ -53,7 +53,7 @@ struct GraphTests {
         #expect(Graph.description(nil, options: options) == nil)
         let graph = Graph()
         let description = try #require(Graph.description(graph, options: options))
-        let dotGraph = description.takeUnretainedValue() as! String
+        let dotGraph = description as! String
         let expectedEmptyDotGraph = #"""
         digraph {
         }
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/SubgraphTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/SubgraphTests.swift
@@ -4,6 +4,7 @@
 
 import Testing
 
+@Suite(.enabled(if: compatibilityTestEnabled))
 struct SubgraphTests {
     @Test
     func shouldRecordTree() {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ extension Graph {`
`13`	`13`	`guard let description = Graph.description(nil, options: options) else {`
`14`	`14`	`return nil`
`15`	`15`	`}`
`16`		`- guard let dictionary = description.takeUnretainedValue() as? NSDictionary else {`
	`16`	`+ guard let dictionary = description as? NSDictionary else {`
`17`	`17`	`return nil`
`18`	`18`	`}`
`19`	`19`	`return dictionary as? [String: Any]`
`@@ -30,7 +30,7 @@ extension Graph {`
`30`	`30`	`else {`
`31`	`31`	`return nil`
`32`	`32`	`}`
`33`		`- return description.takeUnretainedValue() as? String`
	`33`	`+ return description as? String`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`