diff --git a/static_core/plugins/ets/CMakeLists.txt b/static_core/plugins/ets/CMakeLists.txt index efa6693cec2b82dd83b6f9dc062f1fe318123bde..e39139156417d910a373b2c82077be2f77b1f63a 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} diff --git a/static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp b/static_core/plugins/ets/runtime/intrinsics/escompat_Array.cpp index c61d5c6dbf9d6624c6adb76b1faf7c49ceef512d..2ac9064631d74d25583b28503be8454c1b95d978 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); }