fix: intel simulators

edusperoni · edusperoni · commit 5371bedd5451 · 2025-03-11T20:49:33.000-03:00
diff --git a/NativeScript/runtime/ClassBuilder.cpp b/NativeScript/runtime/ClassBuilder.cpp
@@ -1,12 +1,42 @@
 #include "ClassBuilder.h"
+#if TARGET_CPU_X86_64 || TARGET_CPU_X86
+#include "SpinLock.h"
+#endif
 
 namespace tns {
 
 // Moved this method in a separate .cpp file because ARC destroys the class
 // created with objc_allocateClassPair when the control leaves this method scope
-
+// TODO: revist this as there are x86 simulator issues, so maybe a lock is
+// needed regardless
 Class ClassBuilder::GetExtendedClass(std::string baseClassName,
                                      std::string staticClassName) {
+#if TARGET_CPU_X86_64 || TARGET_CPU_X86
+  // X86 simulators have this bugged, so we fallback to old behavior
+  static SpinMutex m;
+  SpinLock lock(m);
+  Class baseClass = objc_getClass(baseClassName.c_str());
+  std::string name =
+      !staticClassName.empty()
+          ? staticClassName
+          : baseClassName + "_" +
+                std::to_string(++ClassBuilder::classNameCounter_);
+  Class clazz = objc_getClass(name.c_str());
+
+  if (clazz != nil) {
+    int i = 1;
+    std::string initialName = name;
+    while (clazz != nil) {
+      name = initialName + std::to_string(i++);
+      clazz = objc_getClass(name.c_str());
+    }
+  }
+
+  clazz = objc_allocateClassPair(baseClass, name.c_str(), 0);
+
+  objc_registerClassPair(clazz);
+  return clazz;
+#else
   Class baseClass = objc_getClass(baseClassName.c_str());
   std::string name =
       !staticClassName.empty()
@@ -30,6 +60,7 @@ Class ClassBuilder::GetExtendedClass(std::string baseClassName,
 
   objc_registerClassPair(clazz);
   return clazz;
+#endif
 }
 
 }  // namespace tns
