Misc: promote to 5.3

ocsigen · Apr 11, 2024 · d09852b · d09852b
1 parent 6272f3c
commit d09852b
Show file tree

Hide file tree

Showing 12 changed files with 2,394 additions and 444 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,6 +61,11 @@ jobs:
             skip-effects: false
             skip-test: false
             skip-doc: true
+          - os: ubuntu-latest
+            ocaml-compiler: ocaml-variants.5.3.0+trunk
+            skip-effects: false
+            skip-test: false
+            skip-doc: true
 
     runs-on: ${{ matrix.os }}
 
@@ -83,8 +88,7 @@ jobs:
             default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
             opam: https://github.com/ocaml/opam-repository.git
           dune-cache: true
-          opam-depext: ${{ !matrix.skip-test }}
-          opam-depext-flags: --with-test
+          opam-depext: false
 
       - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
         if: runner.os != 'Windows'
@@ -93,8 +97,12 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           allow-prerelease-opam: true
           dune-cache: true
-          opam-depext: ${{ !matrix.skip-test }}
-          opam-depext-flags: --with-test
+          opam-depext: false
+
+      - run: opam pin add ppxlib git+https://github.com/hhugo/ppxlib.git#trunk-support-53 --no-action
+        if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.3.0+trunk' }}
+
+      - run: opam pin add ./ --no-action
 
       - run: opam install . --best-effort
         if: ${{ matrix.skip-test }}

diff --git a/CHANGES.md b/CHANGES.md
@@ -16,6 +16,7 @@
   js primitives in bytecode/native. It should help if one tries
   to understand the source of the call with gdb (see #677)
 * Runtime: re-enable marshalling of floats, disabled in jsoo 2.0
+* Compiler: initial support for OCaml 5.3
 
 ## Bug fixes
 

diff --git a/compiler/lib/magic_number.ml b/compiler/lib/magic_number.ml
@@ -77,11 +77,12 @@ let v =
   | 5 :: 00 :: _ -> 32
   | 5 :: 01 :: _ -> 33
   | 5 :: 02 :: _ -> 34
+  | 5 :: 03 :: _ -> 35
   | _ ->
-      if Ocaml_version.compare current [ 4; 8 ] < 0
+      if Ocaml_version.compare current [ 4; 08 ] < 0
       then failwith "OCaml version unsupported. Upgrade to OCaml 4.08 or newer."
       else (
-        assert (Ocaml_version.compare current [ 5; 3 ] >= 0);
+        assert (Ocaml_version.compare current [ 5; 04 ] >= 0);
         failwith "OCaml version unsupported. Upgrade js_of_ocaml.")
 
 let current_exe = "Caml1999X", v

diff --git a/compiler/lib/parse_bytecode.ml b/compiler/lib/parse_bytecode.ml
@@ -2412,7 +2412,6 @@ and compile infos pc state instrs =
           | true -> State.pop 2 state
           | false -> State.pop 3 state
         in
-
         compile
           infos
           (pc + 1)

diff --git a/compiler/tests-check-prim/main.output5 b/compiler/tests-check-prim/main.output5
@@ -4,7 +4,6 @@ Missing
 From main.bc:
 caml_alloc_dummy_function
 caml_continuation_use
-caml_drop_continuation
 caml_dynlink_add_primitive
 caml_dynlink_close_lib
 caml_dynlink_get_current_libs
@@ -171,7 +170,6 @@ caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_get_section_table
 caml_static_alloc
 caml_static_free
 caml_terminfo_backup

diff --git a/compiler/tests-check-prim/unix-unix.output5 b/compiler/tests-check-prim/unix-unix.output5
@@ -4,7 +4,6 @@ Missing
 From unix.bc:
 caml_alloc_dummy_function
 caml_continuation_use
-caml_drop_continuation
 caml_dynlink_add_primitive
 caml_dynlink_close_lib
 caml_dynlink_get_current_libs
@@ -282,7 +281,6 @@ caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_get_section_table
 caml_static_alloc
 caml_static_free
 caml_terminfo_backup