From 427662dd084d0b25d088e7aa04e72e03ee1a54e3 Mon Sep 17 00:00:00 2001 From: likholatovevgeny Date: Tue, 9 Sep 2025 08:40:30 +0000 Subject: [PATCH 1/2] Fix2 Signed-off-by: likholatovevgeny --- .../std/concurrency/messageHandler_basic_interface.ets | 2 +- .../ets-func-tests/ets-func-tests-ignored-JIT-REPEATS.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static_core/plugins/ets/tests/ets_func_tests/std/concurrency/messageHandler_basic_interface.ets b/static_core/plugins/ets/tests/ets_func_tests/std/concurrency/messageHandler_basic_interface.ets index 8428a616e7..0d0410ee6d 100644 --- a/static_core/plugins/ets/tests/ets_func_tests/std/concurrency/messageHandler_basic_interface.ets +++ b/static_core/plugins/ets/tests/ets_func_tests/std/concurrency/messageHandler_basic_interface.ets @@ -369,7 +369,7 @@ function testDoubleRemoveMessage() { function main() { let testSuite = new arktest.ArkTestsuite('messageHandlerBasicInterface'); - + testSuite.addTest("testMessageHandlerCreation", testMessageHandlerCreation); testSuite.addTest("testSendEmptyMessage", testSendEmptyMessage); testSuite.addTest("testSendStringMessage", testSendStringMessage); diff --git a/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored-JIT-REPEATS.txt b/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored-JIT-REPEATS.txt index fe34c3fe8f..24225b7279 100644 --- a/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored-JIT-REPEATS.txt +++ b/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored-JIT-REPEATS.txt @@ -32,5 +32,5 @@ escompat/JsonStringifyTest.ets #28746 std/core/EAWorker_out_of_coro_creation.ets -#29357 -std/concurrency/messageHandler_basic_interface.ets +#28966 +std/containers/concurrency/concurrent_hash_map/concurrent_hash_map_concurrent_replace.ets -- Gitee From b9227bc9113bdd6c2a624681d5e95a601c4af7c8 Mon Sep 17 00:00:00 2001 From: likholatovevgeny Date: Wed, 10 Sep 2025 05:28:24 +0000 Subject: [PATCH 2/2] Fail2 Signed-off-by: likholatovevgeny --- static_core/plugins/ets/irtoc_scripts/map_set_common.irt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static_core/plugins/ets/irtoc_scripts/map_set_common.irt b/static_core/plugins/ets/irtoc_scripts/map_set_common.irt index c4a46e435c..da7ad84575 100644 --- a/static_core/plugins/ets/irtoc_scripts/map_set_common.irt +++ b/static_core/plugins/ets/irtoc_scripts/map_set_common.irt @@ -286,7 +286,7 @@ Label(:Loop) Goto(:Done) } - entry := Load(buck_data, ofs).ref + entry := Load(buck_data, ofs).SetNeedBarrier(true).ref object := LoadI(entry).Imm(MapConstants::ENTRY_KEY_OFFSET).ref obj_klass := LoadI(object).Imm(Constants::OBJECT_CLASS_OFFSET).ref @@ -314,7 +314,7 @@ Label(:Loop) Goto(:Done) } - entry := Load(buck_data, ofs).ref + entry := Load(buck_data, ofs).SetNeedBarrier(true).ref object := LoadI(entry).Imm(MapConstants::ENTRY_KEY_OFFSET).ref If(compareByRef(object, key), 0).NE.Likely.b { @@ -343,7 +343,7 @@ Label(:findKeyByValLoop) Goto(:findKeyByValDone) } - entry := Load(buck_data, ofs).ref + entry := Load(buck_data, ofs).SetNeedBarrier(true).ref object := LoadI(entry).Imm(MapConstants::ENTRY_KEY_OFFSET).ref obj_klass := LoadI(object).Imm(Constants::OBJECT_CLASS_OFFSET).ref @@ -470,7 +470,7 @@ end scoped_macro(:processMapGet) do |map, key, idx, mode| offset := findOffset(map, key, idx, "Return(nullptr).ptr") - entry := Load(buck_data, offset).ref + entry := Load(buck_data, offset).SetNeedBarrier(true).ref object := get_object_pointer_imm(entry, MapConstants::ENTRY_VAL_OFFSET) Return(object).ptr -- Gitee