From 1f135b987823aa1ca20d287833ffb9746d9eff7e Mon Sep 17 00:00:00 2001
From: dingwen <dingwen6@huawei.com>
Date: Tue, 28 Sep 2021 14:48:51 +0800
Subject: [PATCH] cross language invoke bugfix

Signed-off-by: dingwen <dingwen6@huawei.com>
---
 ecmascript/napi/include/jsnapi.h |  1 +
 ecmascript/napi/jsnapi.cpp       | 66 ++++++++++++++++++++++++++++++++
 ecmascript/napi/jsnapi_helper.h  |  1 +
 3 files changed, 68 insertions(+)

diff --git a/ecmascript/napi/include/jsnapi.h b/ecmascript/napi/include/jsnapi.h
index 7cfe6e059b..60a6196012 100644
--- a/ecmascript/napi/include/jsnapi.h
+++ b/ecmascript/napi/include/jsnapi.h
@@ -533,6 +533,7 @@ class PUBLIC_API FunctionRef : public ObjectRef {
 public:
     static Local<FunctionRef> New(EcmaVM *vm, FunctionCallback nativeFunc, void *data);
     static Local<FunctionRef> New(EcmaVM *vm, FunctionCallback nativeFunc, Deleter deleter, void *data);
+    static Local<FunctionRef> NewWithProperty(EcmaVM *vm, FunctionCallback nativeFunc, void *data);
     static Local<FunctionRef> NewClassFunction(EcmaVM *vm, FunctionCallbackWithNewTarget nativeFunc, Deleter deleter,
         void *data);
     Local<JSValueRef> Call(const EcmaVM *vm, Local<JSValueRef> thisObj, const Local<JSValueRef> argv[],
diff --git a/ecmascript/napi/jsnapi.cpp b/ecmascript/napi/jsnapi.cpp
index d0a1a458e5..37a8eaae34 100644
--- a/ecmascript/napi/jsnapi.cpp
+++ b/ecmascript/napi/jsnapi.cpp
@@ -765,6 +765,20 @@ Local<FunctionRef> FunctionRef::New(EcmaVM *vm, FunctionCallback nativeFunc, Del
     return JSNApiHelper::ToLocal<FunctionRef>(JSHandle<JSTaggedValue>(current));
 }
 
+Local<FunctionRef> FunctionRef::NewWithProperty(EcmaVM *vm, FunctionCallback nativeFunc, void *data)
+{
+    JSThread *thread = vm->GetJSThread();
+    ObjectFactory *factory = vm->GetFactory();
+    JSHandle<GlobalEnv> env = vm->GetGlobalEnv();
+    JSHandle<JSFunction> current =
+            factory->NewJSFunction(env, reinterpret_cast<void *>(Callback::RegisterCallbackWithProperty));
+    JSHandle<JSNativePointer> funcCallback = factory->NewJSNativePointer(reinterpret_cast<void *>(nativeFunc));
+    JSHandle<JSNativePointer> dataCaddress = factory->NewJSNativePointer(data);
+    JSHandle<JSFunctionExtraInfo> extraInfo(factory->NewFunctionExtraInfo(funcCallback, dataCaddress));
+    current->SetFunctionExtraInfo(thread, extraInfo.GetTaggedValue());
+    return JSNApiHelper::ToLocal<FunctionRef>(JSHandle<JSTaggedValue>(current));
+}
+
 Local<FunctionRef> FunctionRef::NewClassFunction(EcmaVM *vm, FunctionCallbackWithNewTarget nativeFunc, Deleter deleter,
     void *data)
 {
@@ -1301,6 +1315,58 @@ JSTaggedValue Callback::RegisterCallback(ecmascript::EcmaRuntimeCallInfo *info)
     return JSNApiHelper::ToJSHandle(result).GetTaggedValue();
 }
 
+JSTaggedValue Callback::RegisterCallbackWithProperty(ecmascript::EcmaRuntimeCallInfo *info)
+{
+    // Constructor
+    JSThread *thread = info->GetThread();
+    JSHandle<JSTaggedValue> constructor = BuiltinsBase::GetConstructor(info);
+    if (!constructor->IsJSFunction()) {
+        return JSTaggedValue::False();
+    }
+    JSHandle<JSFunction> function(constructor);
+    JSHandle<JSTaggedValue> extraInfoValue(thread, function->GetFunctionExtraInfo());
+    if (!extraInfoValue->IsJSFunctionExtraInfo()) {
+        return JSTaggedValue::False();
+    }
+    JSHandle<JSFunctionExtraInfo> extraInfo(extraInfoValue);
+    // vm
+    Region *region = Region::ObjectAddressToRange(extraInfo.GetTaggedValue().GetTaggedObject());
+    if (region == nullptr) {
+        return JSTaggedValue::False();
+    }
+    EcmaVM *vm = region->GetSpace()->GetHeap()->GetEcmaVM();
+    // data
+    JSHandle<JSTaggedValue> data(thread, extraInfo->GetData());
+    if (!data->IsHeapObject()) {
+        return JSTaggedValue::False();
+    }
+    JSHandle<JSNativePointer> dataObj(data);
+    // callBack
+    JSHandle<JSTaggedValue> callBack(thread, extraInfo->GetCallback());
+    if (!callBack->IsHeapObject()) {
+        return JSTaggedValue::False();
+    }
+    JSHandle<JSNativePointer> callBackObj(callBack);
+    FunctionCallback nativeFunc = (reinterpret_cast<FunctionCallback>(callBackObj->GetExternalPointer()));
+
+    // constructor
+    JSHandle<JSTaggedValue> thisValue(BuiltinsBase::GetConstructor(info));
+
+    // arguments
+    std::vector<Local<JSValueRef>> arguments;
+    array_size_t length = info->GetArgsNumber();
+    for (array_size_t i = 0; i < length; ++i) {
+        arguments.emplace_back(JSNApiHelper::ToLocal<JSValueRef>(BuiltinsBase::GetCallArg(info, i)));
+    }
+
+    Local<JSValueRef> result = nativeFunc(vm,
+        JSNApiHelper::ToLocal<JSValueRef>(thisValue),
+        arguments.data(),
+        arguments.size(),
+        dataObj->GetExternalPointer());
+    return JSNApiHelper::ToJSHandle(result).GetTaggedValue();
+}
+
 JSTaggedValue Callback::RegisterCallbackWithNewTarget(ecmascript::EcmaRuntimeCallInfo *info)
 {
     // Constructor
diff --git a/ecmascript/napi/jsnapi_helper.h b/ecmascript/napi/jsnapi_helper.h
index bd377a3515..53b1cb627f 100644
--- a/ecmascript/napi/jsnapi_helper.h
+++ b/ecmascript/napi/jsnapi_helper.h
@@ -74,6 +74,7 @@ public:
 class Callback {
 public:
     static ecmascript::JSTaggedValue RegisterCallback(ecmascript::EcmaRuntimeCallInfo *info);
+    static ecmascript::JSTaggedValue RegisterCallbackWithProperty(ecmascript::EcmaRuntimeCallInfo *info);
     static ecmascript::JSTaggedValue RegisterCallbackWithNewTarget(ecmascript::EcmaRuntimeCallInfo *info);
 };
 }  // namespace panda
-- 
Gitee