openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 18:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix inner concurrent function call fail

Browse Source 
Signed-off-by: wangzhaoyong <wangzhaoyong@huawei.com>
Change-Id: If9196b61eb23357cbff3edcd5fc34fd83e49e340
This commit is contained in:
wangzhaoyong 2024-01-03 15:58:47 +08:00
parent edf5dc31ac
commit 553e1261af
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecmascript/ecma_vm.cpp
View File

@ -661,6 +661,10 @@ void EcmaVM::TriggerConcurrentCallback(JSTaggedValue result, JSTaggedValue hint)
return;
}
JSHandle<JSFunction> functionInfo(functionValue);
if (functionInfo->IsCallNapi()) {
LOG_ECMA(INFO) << "Function is not taskpool task";
return;
}
JSTaggedValue extraInfoValue = functionInfo->GetFunctionExtraInfo();
if (!extraInfoValue.IsJSNativePointer()) {
LOG_ECMA(INFO) << "FunctionExtraInfo is not JSNativePointer";

1
ecmascript/napi/jsnapi_expo.cpp
View File

@ -2569,6 +2569,7 @@ bool JSNApi::InitForConcurrentFunction(EcmaVM *vm, Local<JSValueRef> function, v
return false;
}
transFunc->SetFunctionExtraInfo(thread, nullptr, nullptr, taskInfo);
transFunc->SetCallNapi(false);
return true;
}