Refactor AnyView init fromValue implementation (#73)

* Refactor AnyView init fromValue implementation

* Optimize test case

Author: Kyle-Ye

Sources/COpenSwiftUI/ProtocolDescriptor.c

@@ -23,17 +23,3 @@ const void *$s11OpenSwiftUI12ViewModifierMp;
 const void *_OpenSwiftUI_viewModifierProtocolDescriptor(void) {
     return &$s11OpenSwiftUI12ViewModifierMp;
 }
-
-void _OpenSwiftUI_callVisitViewType1(void *visitor_value,
-                                     const void *view_type,
-                                     const void *view_pwt) {
-    _OpenSwiftUI_callVisitViewType2(visitor_value, view_type, view_type, view_pwt);
-}
-
-OPENSWIFTUI_EXPORT
-void _OpenSwiftUI_callVisitViewType2(void *visitor_value,
-                                     const void *view_type,
-                                     const void *view_type2,
-                                     const void *view_pwt) {
-    _OpenSwiftUI_callVisitViewType(visitor_value, view_type, view_type2, view_pwt);
-}

Sources/COpenSwiftUI/include/ProtocolDescriptor.h

@@ -18,17 +18,6 @@ const void *_OpenSwiftUI_viewProtocolDescriptor(void);
 OPENSWIFTUI_EXPORT
 const void *_OpenSwiftUI_viewModifierProtocolDescriptor(void);
 
-OPENSWIFTUI_EXPORT
-void _OpenSwiftUI_callVisitViewType1(void *visitor_value,
-                                     const void *view_type,
-                                     const void *view_pwt);
-
-OPENSWIFTUI_EXPORT
-void _OpenSwiftUI_callVisitViewType2(void *visitor_value,
-                                     const void *view_type,
-                                     const void *view_type2,
-                                     const void *view_pwt);
-
 OPENSWIFTUI_ASSUME_NONNULL_END
 
 #endif /* ProtocolDescriptor_h */

Sources/OpenSwiftUI/Core/Runtime/ProtocolDescriptor.swift

@@ -42,7 +42,7 @@ struct TupleTypeDescription<PD: ProtocolDescriptor> {
         contentTypes = tupleType.indices.compactMap { index in
             let type = tupleType.type(at: index)
             guard let comformance = TypeConformance<PD>(type) else {
-                print("Ignoring invalid type, type \(type) at index \(index)")
+                print("Ignoring invalid type at index \(index), type \(type)")
                 return nil
             }
             return (index, comformance)

Sources/OpenSwiftUI/View/View/AnyView.swift

@@ -34,20 +34,13 @@ public struct AnyView: PrimitiveView {
         guard let conformace = TypeConformance<ViewDescriptor>(type(of: value)) else {
             return nil
         }
-        // FIXME: pass a structure like the following to _OpenSwiftUI_callVisitViewType1 and remove _OpenSwiftUI_callVisitViewType
-        // x0 = pointer
-        // x1 = View.self
-        // x2 = PWT V: View.self
-        // pointer+0x0 -> pointer+0x18
-        // pointer+0x8 -> Visitor.self
-        // pointer+0x10 -> PWT Visitor: ViewTypeVisitor
-        // pointer+0x18~0x37 -> visitor.value
-        // pointer+0x38 -> visitor.view
-        var visitor: any ViewTypeVisitor = Visitor(value: value)
-        withUnsafeMutablePointer(to: &visitor) { value in
-            _OpenSwiftUI_callVisitViewType1(value, conformace.metadata, conformace.conformance)
+        // Audited for RELEASE_2023
+        var visitor = Visitor(value: value)
+        withUnsafePointer(to: conformace) { pointer in
+            let type = UnsafeRawPointer(pointer).assumingMemoryBound(to: (any View.Type).self)
+            visitor.visit(type: type.pointee)
         }
-        self = (visitor as! Visitor).view!
+        self = visitor.view!
     }
 
     init<V: View>(_ view: V, id: UniqueID?) {
@@ -243,12 +236,3 @@ private struct AnyViewChildList<V: View> {
     @Attribute var view: AnyView
     var id: UniqueID?
 }
-
-@_silgen_name("_OpenSwiftUI_callVisitViewType1")
-func visitViewType(_ visitor: UnsafeMutablePointer<any ViewTypeVisitor>, type: UnsafeRawPointer, pwt: UnsafeRawPointer)
-
-// Called by _OpenSwiftUI_callVisitViewType2 as a temporary workaround implementation
-@_silgen_name("_OpenSwiftUI_callVisitViewType")
-func visit<V: View>(_ visitor: UnsafeMutablePointer<any ViewTypeVisitor>, type: V.Type) {
-    visitor.pointee.visit(type: V.self)
-}

Tests/OpenSwiftUITests/View/Graphic/AngleTests.swift renamed to Tests/OpenSwiftUICompatibilityTests/View/Graphic/AngleTests.swift

@@ -5,7 +5,6 @@
 //  Created by Kyle on 2023/12/17.
 //
 
-import OpenSwiftUI
 import Testing
 
 struct AngleTests {

Tests/OpenSwiftUITests/View/Graphic/AxisTests.swift renamed to Tests/OpenSwiftUICompatibilityTests/View/Graphic/AxisTests.swift

@@ -5,7 +5,6 @@
 //  Created by Kyle on 2023/12/17.
 //
 
-import OpenSwiftUI
 import Testing
 
 struct AxisTests {

Tests/OpenSwiftUITests/View/Control/Slider/SliderTests.swift

@@ -1,12 +1,9 @@
 //
 //  SliderTests.swift
-//  
-//
-//  Created by Kyle on 2023/12/16.
-//
+//  OpenSwiftUITests
 
-import Testing
 @testable import OpenSwiftUI
+import Testing
 
 struct SliderTests {
     @Test

Tests/OpenSwiftUITests/View/Core/InterfaceIdiomTests.swift

@@ -1,9 +1,6 @@
 //
 //  InterfaceIdiomTests.swift
-//
-//
-//  Created by Kyle on 2023/8/30.
-//
+//  OpenSwiftUITests
 
 @testable import OpenSwiftUI
 import Testing

Tests/OpenSwiftUITests/View/View/AnyViewTests.swift

@@ -0,0 +1,20 @@
+//
+//  AnyViewTests.swift
+//  OpenSwiftUITests
+
+@testable import OpenSwiftUI
+import Testing
+
+struct AnyViewTests {
+    @Test
+    func testInitFromValue() throws {
+        let empty = EmptyView()
+        let any = try #require(AnyView(_fromValue: empty))
+        #expect(any.storage.id == nil)
+        let _: EmptyView = any.storage.child()
+        
+        let any1 = AnyView(any)
+        let any2 = try #require(AnyView(_fromValue: any))
+        #expect(any1.storage === any2.storage)
+    }
+}