Draft

.github/workflows/ci.yml

@@ -60,12 +60,6 @@ jobs:
           - { os: ubuntu-latest, configType: tcc }
           - { os: ubuntu-latest, arch: x86, runTest262: true }
           - { os: ubuntu-latest, arch: riscv64 }
-
-          - { os: macos-14, configType: Debug }
-          - { os: macos-14, configType: Release }
-          - { os: macos-14, configType: examples }
-          - { os: macos-14, configType: shared }
-          - { os: macos-14, configType: asan+ubsan, runTest262: true }
     steps:
       - uses: actions/checkout@v6
         with:
@@ -556,18 +550,6 @@ jobs:
           "$ANDROID_HOME/cmake/3.22.1/bin/cmake" --build build --target qjs
           ls -lh build
 
-  ios:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: configure
-        run: |
-          cmake -B build -GXcode -DQJS_BUILD_WERROR=ON -DCMAKE_SYSTEM_NAME:STRING=iOS -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED:BOOL=NO -DQJS_BUILD_LIBC=ON
-      - name: build
-        run: |
-          cmake --build build --config Release --target qjs
-          ls -lh build
-
   mimalloc-linux:
     runs-on: ubuntu-24.04
     env:
@@ -588,33 +570,12 @@ jobs:
         run: |
           make test
 
-  mimalloc-macos:
-    runs-on: macos-latest
-    env:
-      QJS_BUILD_CLI_WITH_STATIC_MIMALLOC: ON
-      MIMALLOC_SHOW_STATS: 1
-    steps:
-      - uses: actions/checkout@v6
-      - name: install dependencies
-        run: |
-          brew install mimalloc
-      - name: build
-        run: |
-          make
-      - name: cxxtest
-        run: |
-          make cxxtest
-      - name: test
-        run: |
-          make test
-
   amalgam:
     strategy:
       matrix:
         # TODO(bnoordhuis) test on windows
         config:
           - { os: ubuntu-latest }
-          - { os: macos-latest }
     runs-on: ${{ matrix.config.os }}
     steps:
       - uses: actions/checkout@v6
@@ -727,16 +688,12 @@ jobs:
         platform:
           - ubuntu-latest
           - windows-latest
-          - macos-latest
 
         exclude:
           # clang-cl only makes sense on windows.
           - platform: ubuntu-latest
             mode:
               name: clang-cl+sanitize
-          - platform: macos-latest
-            mode:
-              name: clang-cl+sanitize
 
           # Use clang-cl instead of MSYS2 clang.
           #
@@ -756,52 +713,22 @@ jobs:
           - platform: ubuntu-latest
             mode:
               name: sanitize+asanonly
-          - platform: macos-latest
-            mode:
-              name: sanitize+asanonly
           - platform: windows-latest
             mode:
               name: sanitize
 
-          # clang is the default on macos
-          # also gcc is an alias to clang
-          - platform: macos-latest
-            mode:
-              name: clang
-          - platform: macos-latest
-            mode:
-              name: gcc
-
           # gcc is the default on linux
           - platform: ubuntu-latest
             mode:
               name: gcc
 
-          # only run sanitizer tests on linux
-          #
-          # gcc/clang's codegen shouldn't massively change across platforms,
-          # and linux supports most of the sanitizers.
-          - platform: macos-latest
-            mode:
-              name: clang+sanitize
-          - platform: macos-latest
-            mode:
-              # macos does not support msan
-              name: clang+msan
-          - platform: macos-latest
-            mode:
-              name: sanitize
-
     steps:
       - name: Setup meson
         run: |
           pipx install meson ninja
       - name: Install mimalloc
         if: ${{ matrix.platform == 'ubuntu-latest' && matrix.features.name == 'mimalloc' }}
         run: sudo apt update && sudo apt -y install libmimalloc-dev
-      - name: Install mimalloc
-        if: ${{ matrix.platform == 'macos-latest' && matrix.features.name == 'mimalloc' }}
-        run: brew install mimalloc
       # TODO: Install mimalloc on Windows
       # You need to:
       # - checkout mimalloc

.github/workflows/docs.yml

@@ -1,6 +1,7 @@
 name: Docs
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/release.yml

@@ -52,35 +52,6 @@ jobs:
         with:
           name: qjs-linux-${{matrix.arch}}
           path: build/*-linux-${{matrix.arch}}
-
-  macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: build
-        run: |
-          mkdir build
-          cd build
-          cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQJS_BUILD_WERROR=ON ..
-          make -j$(getconf _NPROCESSORS_ONLN)
-          make -C .. amalgam # writes build/quickjs-amalgam.zip
-          mv qjs qjs-darwin
-          mv qjsc qjsc-darwin
-      - name: check
-        run: |
-          lipo -info build/qjs-darwin build/qjsc-darwin
-      - name: upload amalgamation
-        uses: actions/upload-artifact@v7
-        with:
-          name: quickjs-amalgam.zip
-          path: build/quickjs-amalgam.zip
-          compression-level: 0 # already compressed
-      - name: upload
-        uses: actions/upload-artifact@v7
-        with:
-          name: qjs-darwin
-          path: build/*-darwin
-
   windows:
     runs-on: windows-latest
     strategy:
@@ -145,7 +116,7 @@ jobs:
             build/qjs-wasi-reactor.wasm
 
   upload-to-release:
-    needs: [linux, macos, windows, wasi, check_meson_version]
+    needs: [linux, windows, wasi, check_meson_version]
     runs-on: ubuntu-22.04
     steps:
       - name: get assets

CMakeLists.txt

@@ -160,12 +160,6 @@ if(WIN32)
     endif()
 endif()
 
-# MacOS and GCC 11 or later need -Wno-maybe-uninitialized
-# https://github.com/quickjs-ng/quickjs/issues/453
-if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
-    xcheck_add_c_compiler_flag(-Wno-maybe-uninitialized)
-endif()
-
 if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
     add_compile_definitions(
         _WASI_EMULATED_PROCESS_CLOCKS
@@ -508,18 +502,12 @@ if(QJS_BUILD_EXAMPLES)
         PREFIX ""
     )
     target_link_libraries(fib PRIVATE qjs_module_lib)
-    if(APPLE)
-        target_link_options(fib PRIVATE -undefined dynamic_lookup)
-    endif()
 
     add_library(point MODULE examples/point.c)
     set_target_properties(point PROPERTIES
         PREFIX ""
     )
     target_link_libraries(point PRIVATE qjs_module_lib)
-    if(APPLE)
-        target_link_options(point PRIVATE -undefined dynamic_lookup)
-    endif()
 
     add_executable(test_fib
         gen/test_fib.c

api-test.c

@@ -1013,6 +1013,131 @@ static void get_uint8array(void)
     JS_FreeRuntime(rt);
 }
 
+static struct {
+    int call_count;
+    int last_line;
+    int last_col;
+    char last_filename[256];
+    char last_funcname[256];
+    int stack_depth;
+    int max_local_count;
+    int abort_at;        /* abort (return -1) on this call, 0 = never */
+} trace_state;
+
+static int debug_trace_cb(JSContext *ctx,
+                          const char *filename,
+                          const char *funcname,
+                          int line,
+                          int col,
+                          void *opaque)
+{
+    trace_state.call_count++;
+    trace_state.last_line = line;
+    trace_state.last_col = col;
+    snprintf(trace_state.last_filename, sizeof(trace_state.last_filename),
+             "%s", filename);
+    snprintf(trace_state.last_funcname, sizeof(trace_state.last_funcname),
+             "%s", funcname);
+    trace_state.stack_depth = JS_GetStackDepth(ctx);
+    int count = 0;
+    JSDebugLocalVar *vars = NULL;
+    assert(JS_GetLocalVariablesAtLevel(ctx, 0, &vars, &count) == 0);
+    if (count > trace_state.max_local_count)
+        trace_state.max_local_count = count;
+    if (vars)
+        JS_FreeLocalVariables(ctx, vars, count);
+    if (trace_state.abort_at > 0 &&
+        trace_state.call_count >= trace_state.abort_at)
+        return -1;
+    return 0;
+}
+
+static void debug_trace(void)
+{
+    JSRuntime *rt = JS_NewRuntime();
+    JSContext *ctx = JS_NewContext(rt);
+
+    memset(&trace_state, 0, sizeof(trace_state));
+    {
+        JSValue ret = eval(ctx, "1+2");
+        assert(!JS_IsException(ret));
+        JS_FreeValue(ctx, ret);
+        assert(trace_state.call_count == 0);
+    }
+
+    JS_SetDebugTraceHandler(ctx, debug_trace_cb, NULL);
+    memset(&trace_state, 0, sizeof(trace_state));
+    {
+        JSValue ret = eval(ctx, "var x = 1; x + 2");
+        assert(!JS_IsException(ret));
+        JS_FreeValue(ctx, ret);
+        assert(trace_state.call_count > 0);
+        assert(!strcmp(trace_state.last_filename, "<input>"));
+    }
+
+    {
+        JSDebugLocalVar *vars = NULL;
+        int count = -1;
+        assert(JS_GetLocalVariablesAtLevel(ctx, 0, &vars, &count) == 0);
+        assert(vars == NULL);
+        assert(count == 0);
+    }
+
+    memset(&trace_state, 0, sizeof(trace_state));
+    {
+        static const char code[] =
+            "function outer() {\n"
+            "  function inner() {\n"
+            "    return 42;\n"
+            "  }\n"
+            "  return inner();\n"
+            "}\n"
+            "outer();\n";
+        JSValue ret = eval(ctx, code);
+        assert(!JS_IsException(ret));
+        JS_FreeValue(ctx, ret);
+        assert(trace_state.call_count > 0);
+        assert(trace_state.stack_depth >= 1);
+    }
+
+    memset(&trace_state, 0, sizeof(trace_state));
+    {
+        static const char code[] =
+            "function f(a, b) {\n"
+            "  var c = a + b;\n"
+            "  return c;\n"
+            "}\n"
+            "f(10, 20);\n";
+        JSValue ret = eval(ctx, code);
+        assert(!JS_IsException(ret));
+        JS_FreeValue(ctx, ret);
+        assert(trace_state.call_count > 0);
+        assert(trace_state.max_local_count >= 2);
+    }
+
+    memset(&trace_state, 0, sizeof(trace_state));
+    trace_state.abort_at = 1;
+    {
+        JSValue ret = eval(ctx, "1+2; 3+4");
+        assert(JS_IsException(ret));
+        JS_FreeValue(ctx, ret);
+        JSValue exc = JS_GetException(ctx);
+        JS_FreeValue(ctx, exc);
+    }
+
+    JS_SetDebugTraceHandler(ctx, NULL, NULL);
+    memset(&trace_state, 0, sizeof(trace_state));
+    {
+        JSValue ret = eval(ctx, "1+2");
+        assert(!JS_IsException(ret));
+        JS_FreeValue(ctx, ret);
+        assert(trace_state.call_count == 0);
+    }
+
+    JS_FreeContext(ctx);
+    JS_FreeRuntime(rt);
+}
+
 static void new_symbol(void)
 {
     JSRuntime *rt = new_runtime();
@@ -1089,6 +1214,7 @@ int main(void)
     slice_string_tocstring();
     immutable_array_buffer();
     get_uint8array();
+    debug_trace();
     new_symbol();
     return 0;
 }