From 56e72147d24e2219682bff0b2ea0d98495c746ae Mon Sep 17 00:00:00 2001 From: HyukWoo Park Date: Wed, 16 Oct 2024 14:00:42 +0900 Subject: [PATCH] Update macOS version in actions Signed-off-by: HyukWoo Park --- .github/workflows/android-release.yml | 2 +- .github/workflows/es-actions.yml | 20 ++++++++++---------- build/android/escargot/build.gradle | 1 - src/parser/CodeBlock.cpp | 2 -- src/wasm/WASMOperations.cpp | 2 -- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index d0600bc7b..aee6cf843 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -40,7 +40,7 @@ jobs: overwrite: true build-android-on-macos: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/es-actions.yml b/.github/workflows/es-actions.yml index 283f74524..d37b4343a 100644 --- a/.github/workflows/es-actions.yml +++ b/.github/workflows/es-actions.yml @@ -25,7 +25,7 @@ jobs: run: tools/check_tidy.py build-on-macos: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: @@ -33,21 +33,21 @@ jobs: - name: Install Packages run: | brew update - brew install cmake ninja pkg-config + brew install cmake ninja pkg-config icu4c - name: Build x64 env: BUILD_OPTIONS: -DESCARGOT_WASM=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja run: | cmake -H. -Bout/debug/ -DESCARGOT_MODE=debug $BUILD_OPTIONS ninja -Cout/debug/ - ./tools/run-tests.py --engine="./out/debug/escargot" new-es + $RUNNER --engine="./out/debug/escargot" new-es cmake -H. -Bout/release/ -DESCARGOT_MODE=release $BUILD_OPTIONS ninja -Cout/release/ cp test/octane/*.js . ./out/release/escargot run.js build-test-on-android: - runs-on: macos-12 + runs-on: macos-13 strategy: matrix: arch: [x86, x86_64] @@ -99,7 +99,7 @@ jobs: run: | CC=clang CXX=clang++ cmake -H. -Bout/clang/x64 $BUILD_OPTIONS ninja -Cout/clang/x64 - ./tools/run-tests.py --engine="./out/clang/x64/escargot" new-es + $RUNNER --engine="./out/clang/x64/escargot" new-es test-on-windows-clang-cl: runs-on: windows-2022 @@ -378,9 +378,9 @@ jobs: cmake --build build/out_linux64_release/ - name: Test run: | - LD_LIBRARY_PATH=/usr/icu32/lib/ GC_FREE_SPACE_DIVISOR=1 tools/run-tests.py --arch=x86 --engine="${{ github.workspace }}/build/out_linux_release/escargot" test262 - LD_LIBRARY_PATH=/usr/icu32/lib/ GC_FREE_SPACE_DIVISOR=1 ESCARGOT_LD_PRELOAD=${{ github.workspace }}/backtrace-hooking-32.so tools/run-tests.py --arch=x86 --engine="${{ github.workspace }}/build/out_linux/escargot" test262 - LD_LIBRARY_PATH=/usr/icu64/lib/ GC_FREE_SPACE_DIVISOR=1 tools/run-tests.py --arch=x86_64 --engine="${{ github.workspace }}/build/out_linux64_release/escargot" test262 + LD_LIBRARY_PATH=/usr/icu32/lib/ GC_FREE_SPACE_DIVISOR=1 $RUNNER --arch=x86 --engine="${{ github.workspace }}/build/out_linux_release/escargot" test262 + LD_LIBRARY_PATH=/usr/icu32/lib/ GC_FREE_SPACE_DIVISOR=1 ESCARGOT_LD_PRELOAD=${{ github.workspace }}/backtrace-hooking-32.so $RUNNER --arch=x86 --engine="${{ github.workspace }}/build/out_linux/escargot" test262 + LD_LIBRARY_PATH=/usr/icu64/lib/ GC_FREE_SPACE_DIVISOR=1 $RUNNER --arch=x86_64 --engine="${{ github.workspace }}/build/out_linux64_release/escargot" test262 LD_LIBRARY_PATH=/usr/icu64/lib/ python tools/kangax/run-kangax.py --engine="${{ github.workspace }}/build/out_linux64/escargot" build-test-on-self-hosted-arm-linux: @@ -396,7 +396,7 @@ jobs: cmake --build ./out/ - name: Test run: | - GC_FREE_SPACE_DIVISOR=1 tools/run-tests.py --engine="${{ github.workspace }}/out/escargot" --test262-extra-arg="--skip intl402" new-es v8 spidermonkey chakracore test262 + GC_FREE_SPACE_DIVISOR=1 $RUNNER --engine="${{ github.workspace }}/out/escargot" --test262-extra-arg="--skip intl402" new-es v8 spidermonkey chakracore test262 build-test-on-self-hosted-arm64-linux: runs-on: [self-hosted, linux, arm64] @@ -411,7 +411,7 @@ jobs: cmake --build ./out/ - name: Test run: | - GC_FREE_SPACE_DIVISOR=1 tools/run-tests.py --engine="${{ github.workspace }}/out/escargot" --test262-extra-arg="--skip intl402" test262 chakracore spidermonkey v8 new-es + GC_FREE_SPACE_DIVISOR=1 $RUNNER --engine="${{ github.workspace }}/out/escargot" --test262-extra-arg="--skip intl402" test262 chakracore spidermonkey v8 new-es build-test-debugger: runs-on: ubuntu-latest diff --git a/build/android/escargot/build.gradle b/build/android/escargot/build.gradle index 5bd427803..876ba479c 100644 --- a/build/android/escargot/build.gradle +++ b/build/android/escargot/build.gradle @@ -78,7 +78,6 @@ android { externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt" - version "3.18.1" } } diff --git a/src/parser/CodeBlock.cpp b/src/parser/CodeBlock.cpp index f1972b4a7..20e81856c 100644 --- a/src/parser/CodeBlock.cpp +++ b/src/parser/CodeBlock.cpp @@ -549,7 +549,6 @@ void InterpretedCodeBlock::computeBlockVariables(LexicalBlockIndex currentBlockI ASSERT(bi != nullptr); size_t heapIndex = 0; - size_t stackSize = 0; for (size_t i = 0; i < bi->identifiers().size(); i++) { if (!m_canAllocateVariablesOnStack) { bi->identifiers()[i].m_needToAllocateOnStack = false; @@ -557,7 +556,6 @@ void InterpretedCodeBlock::computeBlockVariables(LexicalBlockIndex currentBlockI if (bi->identifiers()[i].m_needToAllocateOnStack) { bi->identifiers()[i].m_indexForIndexedStorage = currentStackAllocatedVariableIndex; - stackSize++; currentStackAllocatedVariableIndex++; maxStackAllocatedVariableDepth = std::max(maxStackAllocatedVariableDepth, currentStackAllocatedVariableIndex); } else { diff --git a/src/wasm/WASMOperations.cpp b/src/wasm/WASMOperations.cpp index 14e901ca7..65ea4dcfd 100644 --- a/src/wasm/WASMOperations.cpp +++ b/src/wasm/WASMOperations.cpp @@ -404,7 +404,6 @@ void WASMOperations::readImportsOfModule(ExecutionState& state, wasm_module_t* m Value v = o.asObject()->get(state, ObjectPropertyName(state, compNameValue)).value(state, o); bool throwLinkError = false; - size_t externFuncCount = 0; switch (wasm_externtype_kind(externtype)) { case WASM_EXTERN_FUNC: { // If externtype is of the form func functype, @@ -425,7 +424,6 @@ void WASMOperations::readImportsOfModule(ExecutionState& state, wasm_module_t* m funcaddr = wasmCreateHostFunction(state, v.asObject(), wasm_externtype_as_functype(externtype)); // TODO Let index be the number of external functions in imports. This value index is known as the index of the host function funcaddr. - externFuncCount++; } // Let externfunc be the external value func funcaddr.