Fix CoreGlue crash

Sources/OpenSwiftUI/CoreGlue/OpenSwiftUIGlue.swift

@@ -0,0 +1,20 @@
+//
+//  OpenSwiftUIGlue.swift
+//  OpenSwiftUI
+//
+//  Audited for iOS 18.0
+//  Status: Empty
+
+@_spi(ForOpenSwiftUIOnly)
+import OpenSwiftUICore
+
+@_cdecl("OpenSwiftUIGlueClass")
+func OpenSwiftUIGlueClass() -> CoreGlue.Type {
+    OpenSwiftUIGlue.self
+}
+
+final class OpenSwiftUIGlue: CoreGlue {
+    override func makeDefaultLayoutComputer() -> MakeDefaultLayoutComputerResult {
+        MakeDefaultLayoutComputerResult(value: ViewGraph.current.$defaultLayoutComputer)
+    }
+}

Sources/OpenSwiftUICore/View/CoreGlue/CoreGlue.swift → Sources/OpenSwiftUICore/CoreGlue/CoreGlue.swift

@@ -9,15 +9,15 @@
 
 public import Foundation
 package import OpenGraphShims
+import OpenSwiftUI_SPI
 
 @_spi(ForOpenSwiftUIOnly)
 @objc(OpenSwiftUICoreGlue)
 open class CoreGlue: NSObject {
-    package static var shared: CoreGlue = CoreGlue() // FIXME
-
+    package static var shared: CoreGlue = _initializeCoreGlue() as! CoreGlue
 
     open func makeDefaultLayoutComputer() -> MakeDefaultLayoutComputerResult {
-        preconditionFailure("TODO")
+        preconditionFailure("")
     }
 }
 

Sources/OpenSwiftUICore/Graph/GraphInputs.swift

@@ -319,9 +319,8 @@ extension _GraphInputs {
 
     @inline(__always)
     package func detechedEnvironmentInputs() -> Self {
-//        var newInputs = self
-//        newInputs.cachedEnvironment = MutableBox(cachedEnvironment.wrappedValue)
-//        return newInputs
-        preconditionFailure("TO BE REMOVED")
+        var newInputs = self
+        newInputs.cachedEnvironment = MutableBox(cachedEnvironment.wrappedValue)
+        return newInputs
     }
 }

Sources/OpenSwiftUICore/Layout/SafeArea/SafeAreaInsetsModifier.swift

@@ -22,7 +22,8 @@ package struct _SafeAreaInsetsModifier: /* MultiViewModifier, */ PrimitiveViewMo
     }
 
     nonisolated package static func _makeView(modifier: _GraphValue<_SafeAreaInsetsModifier>, inputs: _ViewInputs, body: @escaping (_Graph, _ViewInputs) -> _ViewOutputs) -> _ViewOutputs {
-        preconditionFailure("TODO")
+        // preconditionFailure("TODO")
+        return body(_Graph(), inputs)
     }
 }
 

Sources/OpenSwiftUICore/View/Responder/ViewRespondersKey.swift

@@ -28,7 +28,7 @@ package struct HitTestBindingModifier: ViewModifier, /*MultiViewModifier,*/ Prim
         body: @escaping (_Graph, _ViewInputs) -> _ViewOutputs
     ) -> _ViewOutputs {
         // preconditionFailure("TODO")
-        makeDebuggableView(modifier: modifier, inputs: inputs, body: body)
+        return body(_Graph(), inputs)
     }
 
     package typealias Body = Never

Sources/OpenSwiftUI_SPI/Util/CoreGlue.h

@@ -0,0 +1,15 @@
+//
+//  CoreGlue.h
+//  OpenSwiftUI_SPI
+//
+//  Audited for iOS 15.5
+//  Status: Complete
+
+#ifndef CoreGlue_h
+#define CoreGlue_h
+
+#include "OpenSwiftUIBase.h"
+
+id _initializeCoreGlue();
+
+#endif /* CoreGlue_h */

Sources/OpenSwiftUI_SPI/Util/CoreGlue.m

@@ -0,0 +1,42 @@
+//
+//  CoreGlue.m
+//  OpenSwiftUI_SPI
+//
+//  Audited for iOS 18.0
+//  Status: Complete
+
+#include "CoreGlue.h"
+#include <dlfcn.h>
+
+void abort_report_np(const char*, ...);
+
+void* OpenSwiftUILibrary();
+void * getSwiftUIGlueClassSymbolLoc();
+
+id _initializeCoreGlue() {
+    void *location = getSwiftUIGlueClassSymbolLoc();
+    Class (*classFunc)(void) = (Class (*)(void))location;
+    Class glueClass = classFunc();
+    return [[glueClass alloc] init];
+}
+
+void* OpenSwiftUILibrary() {
+    // Since we are staticlly linking OpenSwiftUI and OpenSwiftUICore into the final binary,
+    // we can just use dlopen(NULL, RTLD_LAZY) to get the current macho binary handle
+    return dlopen(NULL, RTLD_LAZY);
+}
+
+void *getSwiftUIGlueClassSymbolLoc() {
+    static void *ptr;
+    if (ptr == NULL) {
+        @try {
+            ptr = dlsym(OpenSwiftUILibrary(), "OpenSwiftUIGlueClass");
+        } @finally {
+        }
+    }
+    if (ptr == NULL) {
+        const char *error = dlerror();
+        abort_report_np("%s", error);
+    }
+    return ptr;
+}

Sources/OpenSwiftUI_SPI/Util/LockedPointer.h

@@ -1,6 +1,6 @@
 //
 //  LockedPointer.h
-//  OpenSwiftUI
+//  OpenSwiftUI_SPI
 //
 //  Audited for iOS 15.5
 //  Status: Complete