From f35d4492c3ad44cadb98d78f70c2d2660d688426 Mon Sep 17 00:00:00 2001 From: yanzhiqi1 Date: Wed, 9 Apr 2025 16:18:37 +0800 Subject: [PATCH 01/12] fix security warnings Issue: #IC23AX Signed-off-by: yanzhiqi1 --- tooling/agent/tracing_impl.cpp | 8 ++++++++ tooling/client/domain/debugger_client.cpp | 4 ++++ tooling/client/domain/runtime_client.cpp | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/tooling/agent/tracing_impl.cpp b/tooling/agent/tracing_impl.cpp index b4540572..49054bcc 100644 --- a/tooling/agent/tracing_impl.cpp +++ b/tooling/agent/tracing_impl.cpp @@ -93,6 +93,10 @@ void TracingImpl::DispatcherImpl::RequestMemoryDump(const DispatchRequest &reque { std::unique_ptr params = RequestMemoryDumpParams::Create(request.GetParams()); + if (params == nullptr) { + SendResponse(request, DispatchResponse::Fail("wrong params")); + return; + } std::string dumpGuid; bool success = false; DispatchResponse response = tracing_->RequestMemoryDump(std::move(params), dumpGuid, success); @@ -103,6 +107,10 @@ void TracingImpl::DispatcherImpl::Start(const DispatchRequest &request) { std::unique_ptr params = StartParams::Create(request.GetParams()); + if (params == nullptr) { + SendResponse(request, DispatchResponse::Fail("wrong params")); + return; + } DispatchResponse response = tracing_->Start(std::move(params)); SendResponse(request, response); } diff --git a/tooling/client/domain/debugger_client.cpp b/tooling/client/domain/debugger_client.cpp index 0cf24c78..821fd330 100644 --- a/tooling/client/domain/debugger_client.cpp +++ b/tooling/client/domain/debugger_client.cpp @@ -381,6 +381,10 @@ void DebuggerClient::PausedReply(const std::unique_ptr json) std::map> data; for (int32_t i = 0; i < callFrames->GetSize(); i++) { std::unique_ptr callFrameInfo = CallFrame::Create(*(callFrames->Get(i))); + if (callFrameInfo == nullptr) { + LOGE("arkdb: get call frame info error"); + return; + } data.emplace(i + 1, std::move(callFrameInfo)); } diff --git a/tooling/client/domain/runtime_client.cpp b/tooling/client/domain/runtime_client.cpp index a46c1bc6..0293330c 100644 --- a/tooling/client/domain/runtime_client.cpp +++ b/tooling/client/domain/runtime_client.cpp @@ -297,6 +297,10 @@ void RuntimeClient::HandleHeapUsage(std::unique_ptr json) Session *session = SessionManager::getInstance().GetSessionById(sessionId_); VariableManager &variableManager = session->GetVariableManager(); std::unique_ptr heapUsageReturns = GetHeapUsageReturns::Create(*result); + if (heapUsageReturns == nullptr) { + LOGE("arkdb: get heap usage returns error"); + return; + } variableManager.SetHeapUsageInfo(std::move(heapUsageReturns)); variableManager.ShowHeapUsageInfo(); } -- Gitee From 3ef118885423d7dc9372aada3f75f2f77593d758 Mon Sep 17 00:00:00 2001 From: groshevmaksim Date: Thu, 24 Apr 2025 16:54:29 +0300 Subject: [PATCH 02/12] Adding test because of removing nodevm Issue: https://gitee.com/openharmony/arkcompiler_toolchain/issues/IC3S1P Tests: ninja all tests Change-Id: Id0d5c2eb8b1992359ba67ecaf8bb049b18b59586 Signed-off-by: groshevmaksim --- build/core/gn/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/build/core/gn/BUILD.gn b/build/core/gn/BUILD.gn index fc7bbe19..f6a0a6b8 100644 --- a/build/core/gn/BUILD.gn +++ b/build/core/gn/BUILD.gn @@ -111,6 +111,7 @@ group("hybrid") { if (target_os != "mingw") { deps += [ "$ark_root/static_core/plugins/ets/runtime/interop_js:ets_interop_js_napi", + "$ark_root/static_core/plugins/ets/tests/interop_js/test_helper:interop_test_helper", "$ark_root/static_core/tools/ark_js_napi_cli:ark_js_napi_cli", ] } -- Gitee From 5c879811b689b5b9e2a97855183df2ee8c4df273 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Wed, 30 Apr 2025 22:08:10 +0800 Subject: [PATCH 03/12] modify of hybrid-vm Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC5IIB Change-Id: I0394f393749eb4bd2aeb181c351f77d89f9b49bc Signed-off-by: wengchangcheng --- BUILD.gn | 23 +++++++++++++++++++ build/compile_script/ark.py | 30 ++++++++++++++++--------- build/config/BUILDCONFIG.gn | 2 ++ build/core/gn/BUILD.gn | 13 +++++++++-- tooling/client/ark_multi/main.cpp | 1 + tooling/test/BUILD.gn | 5 ++++- tooling/test/client_utils/test_list.cpp | 10 +++++++-- 7 files changed, 68 insertions(+), 16 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 40bf3889..9226c047 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -189,11 +189,34 @@ config("ark_toolchain_common_config") { } else { defines += [ "NDEBUG" ] } + + if (defined(enable_cmc_gc) && enable_cmc_gc) { + defines += [ "USE_CMC_GC" ] + defines += [ "USE_READ_BARRIER" ] + } } config("ark_toolchain_public_config") { defines = [] + if (defined(enable_cmc_gc) && enable_cmc_gc) { + cflags_cc = [ + "-Wno-unused-command-line-argument", + "-Wno-variadic-macros", + "-Wno-gnu-anonymous-struct", + "-Wno-zero-length-array", + "-Wno-nested-anon-types", + "-Wno-c99-extensions", + "-Wno-unused-parameter", + "-Wno-shadow", + "-Wno-pedantic", + "-Wno-gnu-zero-variadic-macro-arguments", + "-Wno-unused-lambda-capture", + "-Wno-unused-function", + "-Wno-unused-variable", + ] + } + # debug is not compatible with ios for now if (!is_mingw && !is_mac && target_os != "ios") { defines += [ diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index 60035a4c..9c360092 100755 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -279,6 +279,10 @@ class ArkPy: "description": "Keep running unittest etc. until errors occured less than N times" " (use 0 to ignore all errors).", }, + "fast-rebuild": { + "flags": ["--fast-rebuild", "-fast-rebuild"], + "description": "Skip gn gen when not modify gn file", + }, }, "help": { "flags": ["help", "--help", "--h", "-help", "-h"], @@ -295,6 +299,7 @@ class ArkPy: enable_verbose = False enable_keepdepfile = False ignore_errors = 1 + fast_rebuild = False def __main__(self, arg_list: list): enable_ccache() @@ -828,15 +833,18 @@ class ArkPy: _write(build_log_path, str_to_build_log, "a") # gn command print("=== gn gen start ===") - code = call_with_output( - "{0} gen {1} --args=\"{2}\" --export-compile-commands".format( - self.gn_binary_path, out_path, " ".join(gn_args).replace("\"", "\\\"")), - build_log_path) - if code != 0: - print("=== gn gen failed! ===\n") - sys.exit(code) + if self.fast_rebuild: + print("=== skip gn gen ===") else: - print("=== gn gen success! ===\n") + code = call_with_output( + "{0} gen {1} --args=\"{2}\" --export-compile-commands".format( + self.gn_binary_path, out_path, " ".join(gn_args).replace("\"", "\\\"")), + build_log_path) + if code != 0: + print("=== gn gen failed! ===\n") + sys.exit(code) + else: + print("=== gn gen success! ===\n") # ninja command # Always add " -d keeprsp" to ninja command to keep response file("*.rsp"), thus we could get shared libraries # of an excutable from its response file. @@ -1015,9 +1023,6 @@ class ArkPy: elif self.is_dict_flags_match_arg(self.ARG_DICT.get("target").get("test262"), arg_list[0]): self.build_for_test262(out_path, gn_args, arg_list) elif self.is_dict_flags_match_arg(self.ARG_DICT.get("target").get("unittest"), arg_list[0]): - if len(arg_list) > 1: - print("\033[92m\"unittest\" not support additional arguments.\033[0m\n".format()) - sys.exit(0) self.build_for_unittest(out_path, gn_args, self.UNITTEST_LOG_FILE_NAME) elif self.is_dict_flags_match_arg(self.ARG_DICT.get("target").get("runtime_core_unittest"), arg_list[0]): if len(arg_list) > 1: @@ -1074,6 +1079,9 @@ class ArkPy: input_value )) sys.exit(0) + # match [option][fast-rebuild] flag + elif self.is_dict_flags_match_arg(self.ARG_DICT.get("option").get("fast-rebuild"), arg): + self.fast_rebuild = True # make a new list with flag that do not match any flag in [option] else: arg_list_ret.append(arg) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 6f9d1fbf..1b0b1cdb 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -12,6 +12,7 @@ # limitations under the License. declare_args() { ark_standalone_build = true + ark_hybrid = false use_musl = true build_root = "//arkcompiler/toolchain/build" run_with_qemu = false @@ -19,6 +20,7 @@ declare_args() { enable_lto_O0 = false disable_force_gc = false timeout = 1200 + enable_cmc_gc = false } check_mac_system_and_cpu_script = diff --git a/build/core/gn/BUILD.gn b/build/core/gn/BUILD.gn index 99c30b2a..11e1ff10 100644 --- a/build/core/gn/BUILD.gn +++ b/build/core/gn/BUILD.gn @@ -101,7 +101,12 @@ group("static_core") { deps += [ "$ark_root/static_core/static_linker:static_linker" ] } if (target_os != "mingw" && target_os != "mac") { - deps += [ "$ark_root/static_core/runtime:libarkruntime" ] + if (ark_hybrid) { + deps += [ "$js_root:libark_jsruntime" ] + } else { + deps += [ "$ark_root/static_core/runtime:libarkruntime" ] + } + } } @@ -109,7 +114,6 @@ group("hybrid") { deps = [ ":ets_frontend", ":ets_runtime", - ":static_core", "$ark_root/static_core/plugins/ets:etsstdlib(${host_toolchain})", ] if (target_os != "mingw" && target_os != "mac") { @@ -119,6 +123,11 @@ group("hybrid") { "$ark_root/static_core/tools/ark_js_napi_cli:ark_js_napi_cli", ] } + + if (!ark_hybrid) { + deps += [ ":static_core" ] + } + } group("toolchain") { diff --git a/tooling/client/ark_multi/main.cpp b/tooling/client/ark_multi/main.cpp index 0cf44374..20dab54c 100644 --- a/tooling/client/ark_multi/main.cpp +++ b/tooling/client/ark_multi/main.cpp @@ -16,6 +16,7 @@ #include #include "ecmascript/js_runtime_options.h" +#include "ecmascript/napi/include/jsnapi_expo.h" #include "ecmascript/platform/file.h" #include "tooling/utils/utils.h" #ifdef PANDA_TARGET_MACOS diff --git a/tooling/test/BUILD.gn b/tooling/test/BUILD.gn index 46dd78d9..a9fe03da 100644 --- a/tooling/test/BUILD.gn +++ b/tooling/test/BUILD.gn @@ -223,13 +223,16 @@ host_unittest_action("DebuggerTest") { # hiviewdfx libraries external_deps = hiviewdfx_ext_deps + # libuv should be before libark_jsruntime + # because there are libuv weak symbols in libark_jsruntime + # and libuv should be loaded before their resolution + external_deps += [ "libuv:uv" ] external_deps += [ "bounds_checking_function:libsec_shared", "cJSON:cjson", "ets_runtime:libark_jsruntime", "icu:shared_icui18n", "icu:shared_icuuc", - "libuv:uv", "runtime_core:libarkbase_static", ] deps += hiviewdfx_deps diff --git a/tooling/test/client_utils/test_list.cpp b/tooling/test/client_utils/test_list.cpp index 24e7883d..f261ce16 100644 --- a/tooling/test/client_utils/test_list.cpp +++ b/tooling/test/client_utils/test_list.cpp @@ -90,8 +90,11 @@ static void RegisterTests() TestUtil::RegisterTest("JsSourceTest", GetJsSourceTest()); TestUtil::RegisterTest("JsTracingTest", GetJsTracingTest()); TestUtil::RegisterTest("JsWatchTest", GetJsWatchTest()); +#ifndef USE_CMC_GC + // TODO: Need support heapdump TestUtil::RegisterTest("JsHeapdumpTest", GetJsHeapdumpTest()); - TestUtil::RegisterTest("JsAllocationtrackTest", GetJsAllocationtrackTest()); + TestUtil::RegisterTest("JsHeapdumpLoopTest", GetJsHeapdumpLoopTest()); +#endif TestUtil::RegisterTest("JsStepintoTest", GetJsStepintoTest()); TestUtil::RegisterTest("JsStepoutTest", GetJsStepoutTest()); TestUtil::RegisterTest("JsStepoverTest", GetJsStepoverTest()); @@ -110,9 +113,12 @@ static void RegisterTests() TestUtil::RegisterTest("JsHeapusageTest", GetJsHeapusageTest()); TestUtil::RegisterTest("JsHeapusageAsyncTest", GetJsHeapusageAsyncTest()); TestUtil::RegisterTest("JsHeapusageStepTest", GetJsHeapusageStepTest()); - TestUtil::RegisterTest("JsHeapdumpLoopTest", GetJsHeapdumpLoopTest()); +#ifndef USE_CMC_GC + // TODO: Need support allocation tracker + TestUtil::RegisterTest("JsAllocationtrackTest", GetJsAllocationtrackTest()); TestUtil::RegisterTest("JsAllocationTrackLoopTest", GetJsAllocationTrackLoopTest()); TestUtil::RegisterTest("JsAllocationTrackRecursionTest", GetJsAllocationTrackRecursionTest()); +#endif TestUtil::RegisterTest("JsJsWatchBasicTypeTest", GetJsWatchBasicTypeTest()); TestUtil::RegisterTest("JsJsWatchSetTypeTest", GetJsWatchSetTypeTest()); TestUtil::RegisterTest("JsJsWatchOtherTypeTest", GetJsWatchOtherTypeTest()); -- Gitee From c35e333144bb9eb2dc132b813dd21d82f1873657 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Mon, 5 May 2025 19:05:03 +0800 Subject: [PATCH 04/12] Fix compiler error Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC5IIB Change-Id: Idb627e6576fc2506333f4a15405cc65b9aac38c6 Signed-off-by: wengchangcheng --- BUILD.gn | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9226c047..f3aa5632 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -199,23 +199,21 @@ config("ark_toolchain_common_config") { config("ark_toolchain_public_config") { defines = [] - if (defined(enable_cmc_gc) && enable_cmc_gc) { - cflags_cc = [ - "-Wno-unused-command-line-argument", - "-Wno-variadic-macros", - "-Wno-gnu-anonymous-struct", - "-Wno-zero-length-array", - "-Wno-nested-anon-types", - "-Wno-c99-extensions", - "-Wno-unused-parameter", - "-Wno-shadow", - "-Wno-pedantic", - "-Wno-gnu-zero-variadic-macro-arguments", - "-Wno-unused-lambda-capture", - "-Wno-unused-function", - "-Wno-unused-variable", - ] - } + cflags_cc = [ + "-Wno-unused-command-line-argument", + "-Wno-variadic-macros", + "-Wno-gnu-anonymous-struct", + "-Wno-zero-length-array", + "-Wno-nested-anon-types", + "-Wno-c99-extensions", + "-Wno-unused-parameter", + "-Wno-shadow", + "-Wno-pedantic", + "-Wno-gnu-zero-variadic-macro-arguments", + "-Wno-unused-lambda-capture", + "-Wno-unused-function", + "-Wno-unused-variable", + ] # debug is not compatible with ios for now if (!is_mingw && !is_mac && target_os != "ios") { -- Gitee From 8621cb2f806027310f110bbf4f86027027251648 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Wed, 7 May 2025 16:09:05 +0800 Subject: [PATCH 05/12] fix TODO Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC5IIB Change-Id: Ia694879b3d1bf87b8a1d4660a70dcff8bab95cf5 Signed-off-by: wengchangcheng --- tooling/test/client_utils/test_list.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/test/client_utils/test_list.cpp b/tooling/test/client_utils/test_list.cpp index f261ce16..91d58bd9 100644 --- a/tooling/test/client_utils/test_list.cpp +++ b/tooling/test/client_utils/test_list.cpp @@ -91,7 +91,7 @@ static void RegisterTests() TestUtil::RegisterTest("JsTracingTest", GetJsTracingTest()); TestUtil::RegisterTest("JsWatchTest", GetJsWatchTest()); #ifndef USE_CMC_GC - // TODO: Need support heapdump + // Need support heapdump TestUtil::RegisterTest("JsHeapdumpTest", GetJsHeapdumpTest()); TestUtil::RegisterTest("JsHeapdumpLoopTest", GetJsHeapdumpLoopTest()); #endif @@ -114,7 +114,7 @@ static void RegisterTests() TestUtil::RegisterTest("JsHeapusageAsyncTest", GetJsHeapusageAsyncTest()); TestUtil::RegisterTest("JsHeapusageStepTest", GetJsHeapusageStepTest()); #ifndef USE_CMC_GC - // TODO: Need support allocation tracker + // Need support allocation tracker TestUtil::RegisterTest("JsAllocationtrackTest", GetJsAllocationtrackTest()); TestUtil::RegisterTest("JsAllocationTrackLoopTest", GetJsAllocationTrackLoopTest()); TestUtil::RegisterTest("JsAllocationTrackRecursionTest", GetJsAllocationTrackRecursionTest()); -- Gitee From fadb9be0bc82a8270a843ad7b257299231a4fae1 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Thu, 8 May 2025 23:09:32 +0800 Subject: [PATCH 06/12] Fix gn format Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC6FIU Signed-off-by: wengchangcheng Change-Id: Id21ac275f6237f129e16667aaa20679a932cc425 --- build/core/gn/BUILD.gn | 2 -- tooling/test/BUILD.gn | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/core/gn/BUILD.gn b/build/core/gn/BUILD.gn index 11e1ff10..927d507c 100644 --- a/build/core/gn/BUILD.gn +++ b/build/core/gn/BUILD.gn @@ -106,7 +106,6 @@ group("static_core") { } else { deps += [ "$ark_root/static_core/runtime:libarkruntime" ] } - } } @@ -127,7 +126,6 @@ group("hybrid") { if (!ark_hybrid) { deps += [ ":static_core" ] } - } group("toolchain") { diff --git a/tooling/test/BUILD.gn b/tooling/test/BUILD.gn index a9fe03da..08d70534 100644 --- a/tooling/test/BUILD.gn +++ b/tooling/test/BUILD.gn @@ -223,6 +223,7 @@ host_unittest_action("DebuggerTest") { # hiviewdfx libraries external_deps = hiviewdfx_ext_deps + # libuv should be before libark_jsruntime # because there are libuv weak symbols in libark_jsruntime # and libuv should be loaded before their resolution -- Gitee From efbbc8d3ed22f3f0c33eae5b5b2dd1214167df72 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Fri, 9 May 2025 14:50:40 +0800 Subject: [PATCH 07/12] Fix compiler error when enable cmc-gc Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC6KTX Signed-off-by: wengchangcheng Change-Id: I96c2a9e3c8ab2de3adf7fdb53bb68f927f81c42e --- toolchain_config.gni | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolchain_config.gni b/toolchain_config.gni index 9442eb52..5ed5f7e1 100644 --- a/toolchain_config.gni +++ b/toolchain_config.gni @@ -11,6 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +if (!defined(enable_cmc_gc)) { + enable_cmc_gc = false +} + if (!defined(ark_standalone_build)) { ark_standalone_build = false } -- Gitee From 6a5c2b28b10b4b600ad241ec866b5dce86933396 Mon Sep 17 00:00:00 2001 From: "yingguofeng@huawei.com" Date: Mon, 12 May 2025 16:12:03 +0800 Subject: [PATCH 08/12] (Memory): Fix some issue 1.Fix Compiler error while open cmc 2.Add --gn-args="toolchain_enable_cmc_gc" to resolve conflict Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC6DA6 Signed-off-by: yingguofeng@huawei.com Change-Id: I0c3d610f22a05156f3fbb11858835837e72753a0 --- BUILD.gn | 5 ++++- toolchain_config.gni | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f3aa5632..999796cf 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -190,9 +190,12 @@ config("ark_toolchain_common_config") { defines += [ "NDEBUG" ] } - if (defined(enable_cmc_gc) && enable_cmc_gc) { + if (toolchain_enable_cmc_gc) { + print("########## toolchain enable cmc-gc ##############") defines += [ "USE_CMC_GC" ] defines += [ "USE_READ_BARRIER" ] + } else { + print("########## toolchain disable cmc-gc ##############") } } diff --git a/toolchain_config.gni b/toolchain_config.gni index 5ed5f7e1..60d1354e 100644 --- a/toolchain_config.gni +++ b/toolchain_config.gni @@ -11,10 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -if (!defined(enable_cmc_gc)) { - enable_cmc_gc = false -} - if (!defined(ark_standalone_build)) { ark_standalone_build = false } @@ -23,6 +19,14 @@ if (target_cpu == "arm64") { TARGET = "aarch64" } +declare_args() { + toolchain_enable_cmc_gc = false +} + +if (defined(enable_cmc_gc) && !toolchain_enable_cmc_gc) { + toolchain_enable_cmc_gc = enable_cmc_gc +} + if (!ark_standalone_build) { build_root = "//build" ark_third_party_root = "//third_party" -- Gitee From 066f2e50899b7b2b4eeed6a12210adb5686bfa45 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Mon, 12 May 2025 15:23:11 +0800 Subject: [PATCH 09/12] unify runtime Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC73XQ Signed-off-by: wengchangcheng Change-Id: I19109204f28efb16e6fef679effaed67110ee133 --- tooling/test/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/tooling/test/BUILD.gn b/tooling/test/BUILD.gn index 08d70534..1cfca62b 100644 --- a/tooling/test/BUILD.gn +++ b/tooling/test/BUILD.gn @@ -132,6 +132,7 @@ ohos_shared_library("jsdebugtest") { deps = [ "..:libark_ecma_debugger_test" ] external_deps = [ + "bounds_checking_function:libsec_shared", "ets_runtime:libark_jsruntime", "icu:shared_icuuc", "libuv:uv", -- Gitee From a1f99d4ae103c8fee81ec00b59469441c097a32e Mon Sep 17 00:00:00 2001 From: hanlong Date: Sat, 24 May 2025 15:28:12 +0800 Subject: [PATCH 10/12] Add ut 0524 Issue:https://gitee.com/openharmony/arkcompiler_toolchain/issues/ICA96K?from=project-issue Signed-off-by: hanlong --- test/ut/ignore-ut-debug-x64-toolchain-cmc-gc.txt | 1 + .../ut/ignore-ut-release-qemu-toolchain-cmc-gc.txt | 14 ++++++++++++++ test/ut/ignore-ut-release-x64-toolchain-cmc-gc.txt | 1 + 3 files changed, 16 insertions(+) create mode 100644 test/ut/ignore-ut-debug-x64-toolchain-cmc-gc.txt create mode 100644 test/ut/ignore-ut-release-qemu-toolchain-cmc-gc.txt create mode 100644 test/ut/ignore-ut-release-x64-toolchain-cmc-gc.txt diff --git a/test/ut/ignore-ut-debug-x64-toolchain-cmc-gc.txt b/test/ut/ignore-ut-debug-x64-toolchain-cmc-gc.txt new file mode 100644 index 00000000..fddaabc9 --- /dev/null +++ b/test/ut/ignore-ut-debug-x64-toolchain-cmc-gc.txt @@ -0,0 +1 @@ +# Known failure list for ut - debug - x64 - toolchain -cmc -gc diff --git a/test/ut/ignore-ut-release-qemu-toolchain-cmc-gc.txt b/test/ut/ignore-ut-release-qemu-toolchain-cmc-gc.txt new file mode 100644 index 00000000..a2be333f --- /dev/null +++ b/test/ut/ignore-ut-release-qemu-toolchain-cmc-gc.txt @@ -0,0 +1,14 @@ +# Known failure list for ut - release - qemu - toolchain -cmc -gc + +#24285 +test/test/libjsdebugtest.so + +#25856 +obj/arkcompiler/ets_runtime/ecmascript/mem/cmc_gc/libcommon_components_set/gc_hooks.o + +#26061 +obj/arkcompiler/toolchain/inspector/test/InspectorConnectTestWithQemu +obj/arkcompiler/toolchain/tooling/test/DebuggerClientTestWithQemu +obj/arkcompiler/toolchain/tooling/test/DebuggerEntryTestWithQemu +obj/arkcompiler/toolchain/tooling/test/DebuggerTestWithQemu +obj/arkcompiler/toolchain/tooling/test/DebuggerCIntClientTestWithQemu diff --git a/test/ut/ignore-ut-release-x64-toolchain-cmc-gc.txt b/test/ut/ignore-ut-release-x64-toolchain-cmc-gc.txt new file mode 100644 index 00000000..ac7b2b12 --- /dev/null +++ b/test/ut/ignore-ut-release-x64-toolchain-cmc-gc.txt @@ -0,0 +1 @@ +# Known failure list for ut - release - x64 - toolchain -cmc -gc -- Gitee From ea61c19b4174295bd8cf810de58f1fd3e0a9c4e3 Mon Sep 17 00:00:00 2001 From: zhongmingwei Date: Tue, 27 May 2025 09:17:04 +0800 Subject: [PATCH 11/12] Es2abc support static interface Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICAOLR Description: es2abc support static interface Signed-off-by: zhongmingwei Change-Id: Iba0a10c06240c2ae4c4189eaad1f4bf98156d1c2 --- build/scripts/generate_js_bytecode.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/scripts/generate_js_bytecode.py b/build/scripts/generate_js_bytecode.py index ea7ae832..1b721f63 100755 --- a/build/scripts/generate_js_bytecode.py +++ b/build/scripts/generate_js_bytecode.py @@ -58,6 +58,8 @@ def parse_args(): 'its value will be the path of input file if not specified') parser.add_argument("--enable-annotations", action='store_true', help='whether annotations are enabled or not') + parser.add_argument("--enable-ets-implements", action='store_true', + help='whether ets implements are enabled or not') arguments = parser.parse_args() return arguments @@ -107,6 +109,9 @@ def gen_abc_info(input_arguments): if input_arguments.enable_annotations: src_index = cmd.index(input_arguments.src_js) cmd.insert(src_index, '--enable-annotations') + if input_arguments.enable_ets_implements: + src_index = cmd.index(input_arguments.src_js) + cmd.insert(src_index, '--enable-ets-implements') # insert d.ts option to cmd later cmd.append("--target-api-sub-version=beta3") -- Gitee From a52818f0450220aa405a40b12556ef50c334fd30 Mon Sep 17 00:00:00 2001 From: wangyuzhong Date: Fri, 30 May 2025 21:11:13 +0800 Subject: [PATCH 12/12] United String demand Issue:https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICAOHV Signed-off-by: wangyuzhong --- toolchain_config.gni | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain_config.gni b/toolchain_config.gni index 60d1354e..70978b79 100644 --- a/toolchain_config.gni +++ b/toolchain_config.gni @@ -21,6 +21,7 @@ if (target_cpu == "arm64") { declare_args() { toolchain_enable_cmc_gc = false + enable_base_string = false } if (defined(enable_cmc_gc) && !toolchain_enable_cmc_gc) { -- Gitee