From 67ed740f2aafb579227da2656b9eda242d7165f2 Mon Sep 17 00:00:00 2001
From: Hugo Heuzard <hugo.heuzard@gmail.com>
Date: Mon, 23 Sep 2024 13:20:24 +0200
Subject: [PATCH] Misc: OCaml 5.3 support

---
 CHANGES.md                       | 2 ++
 compiler/tests-compiler/gh747.ml | 4 ++--
 dune-project                     | 2 +-
 js_of_ocaml-compiler.opam        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8ffd45871f..0613fb56d0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -53,12 +53,14 @@
 * Compiler: more inlining - duplicate small function.
 * Compiler: Make it possible to link runtime JavaScript file
   together with OCaml libraries #1509
+* Compiler: initial support for OCaml 5.3
 * Runtime: abort instead of exit when calling unimplemented
   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
 * Runtime: new runtime api for channels
 
+
 ## Bug fixes
 
 * Compiler: fix variable renaming for property binding and assignment target
diff --git a/compiler/tests-compiler/gh747.ml b/compiler/tests-compiler/gh747.ml
index 7aa143ee8d..c2cb059cf9 100644
--- a/compiler/tests-compiler/gh747.ml
+++ b/compiler/tests-compiler/gh747.ml
@@ -141,8 +141,8 @@ let max_array_length = max_wosize ()
 let max_floatarray_length = max_array_length / (64 / word_size)
 let max_string_length = word_size / 8 * max_array_length - 1
 
-type 'a effect
-type exn += Unhandled: 'a effect -> exn
+type 'a effect_
+type exn += Unhandled: 'a effect_ -> exn
 
 type backtrace_slot =
   | Known_location of {
diff --git a/dune-project b/dune-project
index 59f64c1763..39d190fe65 100644
--- a/dune-project
+++ b/dune-project
@@ -18,7 +18,7 @@
  (description
   "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js")
  (depends
-  (ocaml (and (>= 4.08) (< 5.3)))
+  (ocaml (and (>= 4.08) (< 5.4)))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
   (ppxlib (>= 0.15.0))
diff --git a/js_of_ocaml-compiler.opam b/js_of_ocaml-compiler.opam
index 217878193f..6c9ba412f2 100644
--- a/js_of_ocaml-compiler.opam
+++ b/js_of_ocaml-compiler.opam
@@ -13,7 +13,7 @@ doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
   "dune" {>= "3.7"}
-  "ocaml" {>= "4.08" & < "5.3"}
+  "ocaml" {>= "4.08" & < "5.4"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
   "ppxlib" {>= "0.15.0"}