From 20d5843179c3d3ca77d9f744e87f93955e6c4faa Mon Sep 17 00:00:00 2001 From: Csaba Hurton Date: Mon, 8 Sep 2025 16:05:14 +0200 Subject: [PATCH 1/2] Update Helpers::IsStdLib logic Make it indifferent from module names Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICCALN Testing: * all test-u-runner test suits Change-Id: I8c3ed616fe6dc4f5de20268e0eed3dbe4ecbd6d0 Signed-off-by: Csaba Hurton --- static_core/plugins/ets/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static_core/plugins/ets/CMakeLists.txt b/static_core/plugins/ets/CMakeLists.txt index efa6693cec..e391391564 100644 --- a/static_core/plugins/ets/CMakeLists.txt +++ b/static_core/plugins/ets/CMakeLists.txt @@ -55,7 +55,7 @@ function(compile_ets_code ETS_SRC OUTPUT_ABC TARGET) if ("${ETS_SRC}" STREQUAL "GEN_STD_LIB") list(APPEND ES2PANDA_ARGUMENTS "--gen-stdlib=true") set(STAMP "${OUTPUT_ABC}.stamp") - set(STDLIB ${CMAKE_CURRENT_LIST_DIR}/stdlib/) + set(STDLIB ${PANDA_ROOT}/plugins/ets/stdlib/) file(WRITE ${STAMP} "") add_custom_target(${TARGET}.stamp BYPRODUCTS ${STAMP} -- Gitee From adad5814a516e7db71740c554b874c79e04a33ae Mon Sep 17 00:00:00 2001 From: Csaba Hurton Date: Tue, 9 Sep 2025 17:18:33 +0200 Subject: [PATCH 2/2] 25992 temp fix for compile fail --- static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp b/static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp index c61d5c6dbf..2ac9064631 100644 --- a/static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp +++ b/static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp @@ -550,10 +550,10 @@ static void RefReverse(void *arrAddr, int32_t length, mem::GCBarrierSet *barrier } swap(aPtr, bPtr); }; - auto putSafepoint = [&usePreBarrier, barrierSet, arr](size_t dstStart, size_t dstEndMirror, size_t length) { + auto putSafepoint = [&usePreBarrier, barrierSet, arr](size_t dstStart, size_t dstEndMirror, size_t len) { if (barrierSet->GetPostType() != ark::mem::BarrierType::POST_WRB_NONE) { constexpr uint32_t OFFSET = ark::coretypes::Array::GetDataOffset(); - const uint32_t size = length * sizeof(ObjectPointerType); + const uint32_t size = len * sizeof(ObjectPointerType); barrierSet->PostBarrier(arr, OFFSET + dstStart * sizeof(ObjectPointerType), size); barrierSet->PostBarrier(arr, OFFSET + dstEndMirror * sizeof(ObjectPointerType) - size, size); } -- Gitee