fix classMethod flag in native call

Author: DjDeveloperr

include/MethodCif.h

@@ -31,8 +31,6 @@ class MethodCif {
   MethodCif(napi_env env, std::string typeEncoding);
   MethodCif(napi_env env, MDMetadataReader *reader, MDSectionOffset offset,
             bool isMethod = false);
-
-  void call(void *fnptr, void *rvalue, void **avalues);
 };
 
 } // namespace objc_bridge

src/CFunction.mm

@@ -81,7 +81,7 @@
     }
   }
 
-  cif->call(func->fnptr, rvalue, avalues);
+  ffi_call(&cif->cif, FFI_FN(func->fnptr), rvalue, avalues);
 
   if (shouldFreeAny) {
     for (unsigned int i = 0; i < cif->argc; i++) {

src/ClassMember.mm

@@ -124,8 +124,9 @@
 }
 
 inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
-                           id self, void **avalues, void *rvalue,
-                           bool classMethod) {
+                           id self, void **avalues, void *rvalue) {
+  bool classMethod = class_isMetaClass(object_getClass(self));
+
   bool supercall =
       classMethod
           ? class_conformsToProtocol(self,
@@ -148,12 +149,12 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
   if (!supercall) {
 #if defined(__x86_64__)
     if (isStret) {
-      cif->call((void *)objc_msgSend_stret, rvalue, avalues);
+      ffi_call(&cif->cif, FFI_FN(objc_msgSend_stret), rvalue, avalues);
     } else {
-      cif->call((void *)objc_msgSend, rvalue, avalues);
+      ffi_call(&cif->cif, FFI_FN(objc_msgSend), rvalue, avalues);
     }
 #else
-    cif->call((void *)objc_msgSend, rvalue, avalues);
+    ffi_call(&cif->cif, FFI_FN(objc_msgSend), rvalue, avalues);
 #endif
   } else {
     struct objc_super superobj = {self,
@@ -162,12 +163,12 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
     avalues[0] = (void *)&superobjPtr;
 #if defined(__x86_64__)
     if (isStret) {
-      cif->call((void *)objc_msgSendSuper_stret, rvalue, avalues);
+      ffi_call(&cif->cif, FFI_FN(objc_msgSendSuper_stret), rvalue, avalues);
     } else {
-      cif->call((void *)objc_msgSendSuper, rvalue, avalues);
+      ffi_call(&cif->cif, FFI_FN(objc_msgSendSuper), rvalue, avalues);
     }
 #else
-    cif->call((void *)objc_msgSendSuper, rvalue, avalues);
+    ffi_call(&cif->cif, FFI_FN(objc_msgSendSuper), rvalue, avalues);
 #endif
   }
 }
@@ -212,7 +213,7 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
     }
   }
 
-  objcNativeCall(env, jsThis, cif, self, avalues, rvalue, method->classMethod);
+  objcNativeCall(env, jsThis, cif, self, avalues, rvalue);
 
   for (unsigned int i = 0; i < cif->argc; i++) {
     if (shouldFree[i]) {
@@ -252,7 +253,7 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
   void *avalues[2] = {&self, &method->methodOrGetter.selector};
   void *rvalue = cif->rvalue;
 
-  objcNativeCall(env, jsThis, cif, self, avalues, rvalue, method->classMethod);
+  objcNativeCall(env, jsThis, cif, self, avalues, rvalue);
 
   if (cif->returnType->kind == mdTypeInstanceObject) {
     napi_value constructor = jsThis;
@@ -290,7 +291,7 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
   bool shouldFree = false;
   cif->argTypes[0]->toNative(env, argv, avalues[2], &shouldFree, &shouldFree);
 
-  objcNativeCall(env, jsThis, cif, self, avalues, rvalue, method->classMethod);
+  objcNativeCall(env, jsThis, cif, self, avalues, rvalue);
 
   if (shouldFree) {
     cif->argTypes[0]->free(env, *((void **)avalues[2]));

src/MethodCif.mm

@@ -154,8 +154,4 @@
   rvalueLength = cif.rtype->size;
 }
 
-void MethodCif::call(void *fnptr, void *rvalue, void **avalues) {
-  ffi_call(&cif, FFI_FN(fnptr), rvalue, avalues);
-}
-
 } // namespace objc_bridge

src/Object.mm

@@ -4,6 +4,7 @@
 #include "node_api_util.h"
 
 #import <Foundation/Foundation.h>
+#include <objc/runtime.h>
 
 namespace objc_bridge {
 
@@ -70,6 +71,8 @@ void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
   bridgeState->objectRefs.erase(object);
 }
 
+Class UIPlaceholderColorClass = objc_getClass("UIPlaceholderColor");
+
 napi_value ObjCBridgeState::getObject(napi_env env, id obj,
                                       napi_value constructor,
                                       ObjectOwnership ownership) {
@@ -97,6 +100,10 @@ void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
     return nullptr;
   }
 
+  if (cls == UIPlaceholderColorClass) {
+    ownership = kBorrowedObject;
+  }
+
   bool isClass = false;
 
   if (class_isMetaClass(cls)) {