oxcaml · smjleo · Sep 2, 2025 · Jul 14, 2025 · Jul 11, 2025 · Jul 14, 2025
diff --git a/driver/dune b/driver/dune
@@ -16,5 +16,5 @@
  (modes byte native)
  (ocamlopt_flags
   (:include %{project_root}/ocamlopt_flags.sexp))
- (libraries ocamloptcomp flambda2 gc_timings)
+ (libraries ocamloptcomp flambda2 gc_timings jsoo_imports)
  (modules optcompile))
diff --git a/driver/jscompile.ml b/driver/jscompile.ml
@@ -65,7 +65,7 @@ let raw_lambda_to_jsir i raw_lambda ~as_arg_for =
              ~reachable_names:flambda_result.reachable_names
              flambda_result.flambda
            |> print_if i.ppf_dump Clflags.dump_jsir (fun ppf jsir ->
-                  Flambda2_to_jsir.Jsir.Print.program ppf (fun _ _ -> "") jsir)
+                  Jsoo_imports.Code.Print.program ppf (fun _ _ -> "") jsir)
          in
          jsir, program.main_module_block_format, arg_descr)
 
@@ -83,10 +83,9 @@ let emit_jsir i jsir_program =
       output_string oc Config.cmj_magic_number;
       (* We include the highest used variable in the translation, so that Js_of_ocaml
          can read this number and update its own state accordingly. *)
-      let cmj_body : Flambda2_to_jsir.Jsir.cmj_body =
+      let cmj_body : Jsoo_imports.Code.cmj_body =
         { program = jsir_program;
-          last_var =
-            Flambda2_to_jsir.Jsir.Var.idx (Flambda2_to_jsir.Jsir.Var.last ())
+          last_var = Jsoo_imports.Code.Var.idx (Jsoo_imports.Code.Var.last ())
         }
       in
       output_value oc cmj_body)

diff --git a/driver/jscompile.mli b/driver/jscompile.mli
@@ -43,4 +43,4 @@ val to_jsir :
   Compile_common.info ->
   Typedtree.implementation ->
   as_arg_for:Global_module.Parameter_name.t option ->
-  Flambda2_to_jsir.Jsir.program
+  Jsoo_imports.Code.program
diff --git a/lambda/matching.ml b/lambda/matching.ml
@@ -3243,7 +3243,7 @@ let transl_match_on_option value_kind arg loc ~if_some ~if_none =
   (* Keeping the Pisint test would make the bytecode
       slightly worse, but it lets the native compiler generate
       better code -- see #10681. *)
-  if !Clflags.native_code then
+  if !Clflags.native_code || Clflags.is_flambda2 () then
     Lifthenelse(Lprim (Pisint { variant_only = true }, [ arg ], loc),
                 if_none, if_some, value_kind)
   else

diff --git a/middle_end/flambda2/numbers/targetint_31_63.ml b/middle_end/flambda2/numbers/targetint_31_63.ml
@@ -20,6 +20,100 @@
    silently truncates the input int to make it fit, whereas we probably want to
    make it produce an error ? *)
 
+module type S = sig
+  type t
+
+  include Container_types.S with type t := t
+
+  val min_value : t
+
+  val max_value : t
+
+  val minus_one : t
+
+  val zero : t
+
+  val one : t
+
+  val ten : t
+
+  val hex_ff : t
+
+  val bool : bool -> t
+
+  val bool_true : t
+
+  val bool_false : t
+
+  val ( <= ) : t -> t -> bool
+
+  val ( >= ) : t -> t -> bool
+
+  val ( < ) : t -> t -> bool
+
+  val bottom_byte_to_int : t -> int
+
+  val of_char : char -> t
+
+  val of_int : int -> t
+
+  val of_int_option : int -> t option
+
+  val to_int : t -> int
+
+  val to_int_option : t -> int option
+
+  val to_int_exn : t -> int
+
+  val of_int32 : int32 -> t
+
+  val to_int32 : t -> int32
+
+  val of_int64 : int64 -> t
+
+  val to_int64 : t -> int64
+
+  val of_targetint : Targetint_32_64.t -> t
+
+  val to_targetint : t -> Targetint_32_64.t
+
+  val of_float : float -> t
+
+  val to_float : t -> float
+
+  val neg : t -> t
+
+  val get_least_significant_16_bits_then_byte_swap : t -> t
+
+  val add : t -> t -> t
+
+  val sub : t -> t -> t
+
+  val mul : t -> t -> t
+
+  val mod_ : t -> t -> t
+
+  val div : t -> t -> t
+
+  val and_ : t -> t -> t
+
+  val or_ : t -> t -> t
+
+  val xor : t -> t -> t
+
+  val shift_left : t -> int -> t
+
+  val shift_right : t -> int -> t
+
+  val shift_right_logical : t -> int -> t
+
+  val min : t -> t -> t
+
+  val max : t -> t -> t
+
+  val is_non_negative : t -> bool
+end
+
 module T0 = struct
   include Targetint_32_64
 
@@ -98,7 +192,7 @@ module T0 = struct
   let is_non_negative t = t >= zero
 end
 
-module Self = struct
+module With_gc_bit = struct
   include T0
 
   (* Note: the [include T0] must be first so that the [One_bit_fewer] functions
@@ -107,6 +201,21 @@ module Self = struct
   include Container_types.Make (T0)
 end
 
+module Without_gc_bit = struct
+  include T0
+  include Container_types.Make (T0)
+end
+
+(* CR selee: this is extremely sad, and should be replaced with a proper config
+   variable in the future *)
+let has_gc_bit_in_int =
+  let compiler_name = Filename.basename Sys.argv.(0) in
+  match compiler_name with "ocamlj" | "ocamlj.opt" -> false | _ -> true
+
+module Self = (val if has_gc_bit_in_int
+                   then (module With_gc_bit)
+                   else (module Without_gc_bit) : S)
+
 include Self
 
 let all_bools = Set.of_list [bool_true; bool_false]

diff --git a/middle_end/flambda2/numbers/targetint_32_64.ml b/middle_end/flambda2/numbers/targetint_32_64.ml
@@ -124,11 +124,6 @@ module type S = sig
   module Targetint_set = Set
 end
 
-(* CR selee: this is extremely sad *)
-let size =
-  let compiler_name = Filename.basename Sys.argv.(0) in
-  match compiler_name with "ocamlj" | "ocamlj.opt" -> 32 | _ -> Sys.word_size
-
 module Int32 = struct
   include Int32
 
@@ -260,6 +255,12 @@ module Int64 = struct
   external swap_byte_endianness : t -> t = "%bswap_int64"
 end
 
+(* CR selee: this is extremely sad, and should be replaced with a proper config
+   variable in the future *)
+let size =
+  let compiler_name = Filename.basename Sys.argv.(0) in
+  match compiler_name with "ocamlj" | "ocamlj.opt" -> 32 | _ -> Sys.word_size
+
 include (val match size with
              | 32 -> (module Int32)
              | 64 -> (module Int64)

diff --git a/middle_end/flambda2/to_jsir/dune b/middle_end/flambda2/to_jsir/dune
@@ -33,6 +33,7 @@
  (libraries
   ocamlcommon
   ocamloptcomp
+  jsoo_imports
   flambda2_bound_identifiers
   flambda2_cmx
   flambda2_identifiers

diff --git a/middle_end/flambda2/to_jsir/jsoo_imports/README.txt b/middle_end/flambda2/to_jsir/jsoo_imports/README.txt
@@ -0,0 +1,6 @@
+The files in this subdirectory (except import.ml) were imported from js_of_ocaml, with modifications:
+  https://github.com/ocsigen/js_of_ocaml
+
+Originating from git revision:
+  246df644334aa97103d1051aec128337ea1868f9
+
diff --git a/middle_end/flambda2/to_jsir/jsir.ml → ...end/flambda2/to_jsir/jsoo_imports/code.ml b/middle_end/flambda2/to_jsir/jsir.ml → ...end/flambda2/to_jsir/jsoo_imports/code.ml
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  * Copyright (C) 2010 Jérôme Vouillon
@@ -22,7 +20,7 @@
 
 [@@@warning "-4-18-44"]
 
-open! Jsoo_stdlib
+open! Stdlib
 
 let stats = Debug.find "stats"
 

diff --git a/middle_end/flambda2/to_jsir/jsir.mli → ...nd/flambda2/to_jsir/jsoo_imports/code.mli b/middle_end/flambda2/to_jsir/jsir.mli → ...nd/flambda2/to_jsir/jsoo_imports/code.mli
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  * Copyright (C) 2010 Jérôme Vouillon
@@ -19,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
-open! Jsoo_stdlib
+open! Stdlib
 
 module Addr : sig
   type t = int

diff --git a/middle_end/flambda2/to_jsir/debug.ml → ...nd/flambda2/to_jsir/jsoo_imports/debug.ml b/middle_end/flambda2/to_jsir/debug.ml → ...nd/flambda2/to_jsir/jsoo_imports/debug.ml
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  *
@@ -18,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
-open! Jsoo_stdlib
+open! Stdlib
 
 let series = ref None
 

diff --git a/middle_end/flambda2/to_jsir/debug.mli → ...d/flambda2/to_jsir/jsoo_imports/debug.mli b/middle_end/flambda2/to_jsir/debug.mli → ...d/flambda2/to_jsir/jsoo_imports/debug.mli
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  *

diff --git a/middle_end/flambda2/to_jsir/jsoo_imports/dune b/middle_end/flambda2/to_jsir/jsoo_imports/dune
@@ -0,0 +1,12 @@
+(include_subdirs no)
+
+(library
+ (name jsoo_imports)
+ (wrapped true)
+ (instrumentation (backend bisect_ppx))
+ (flags
+  (:standard))
+ (ocamlopt_flags
+  (:standard -O3))
+ (libraries
+  ocamlcommon))
diff --git a/middle_end/flambda2/to_jsir/jsoo_imports/import.ml b/middle_end/flambda2/to_jsir/jsoo_imports/import.ml
@@ -0,0 +1,30 @@
+(******************************************************************************
+ *                                  OxCaml                                    *
+ *                           Leo Lee, Jane Street                             *
+ * -------------------------------------------------------------------------- *
+ *                               MIT License                                  *
+ *                                                                            *
+ * Copyright (c) 2025 Jane Street Group LLC                                   *
+ * opensource-contacts@janestreet.com                                         *
+ *                                                                            *
+ * Permission is hereby granted, free of charge, to any person obtaining a    *
+ * copy of this software and associated documentation files (the "Software"), *
+ * to deal in the Software without restriction, including without limitation  *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,   *
+ * and/or sell copies of the Software, and to permit persons to whom the      *
+ * Software is furnished to do so, subject to the following conditions:       *
+ *                                                                            *
+ * The above copyright notice and this permission notice shall be included    *
+ * in all copies or substantial portions of the Software.                     *
+ *                                                                            *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    *
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    *
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        *
+ * DEALINGS IN THE SOFTWARE.                                                  *
+ ******************************************************************************)
+
+module Jsir = Code
+module Parse_info = Parse_info
diff --git a/middle_end/flambda2/to_jsir/parse_info.ml → ...ambda2/to_jsir/jsoo_imports/parse_info.ml b/middle_end/flambda2/to_jsir/parse_info.ml → ...ambda2/to_jsir/jsoo_imports/parse_info.ml
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  * Copyright (C) 2013 Hugo Heuzard
@@ -20,7 +18,7 @@
  *)
 [@@@warning "-18"]
 
-open! Jsoo_stdlib
+open! Stdlib
 
 type t =
   { src : string option;
@@ -68,3 +66,12 @@ let to_string { name; src; line; col; _ } =
       | None, None -> assert false
     in
     Format.sprintf "%s:%d:%d" file line col
+
+let t_of_debuginfo dbg ~pos =
+  if Debuginfo.is_none dbg
+  then None
+  else
+    let loc = Debuginfo.to_location dbg in
+    match pos with
+    | `Start -> Some (t_of_pos loc.loc_start)
+    | `End -> Some (t_of_pos loc.loc_end)
diff --git a/middle_end/flambda2/to_jsir/parse_info.mli → ...mbda2/to_jsir/jsoo_imports/parse_info.mli b/middle_end/flambda2/to_jsir/parse_info.mli → ...mbda2/to_jsir/jsoo_imports/parse_info.mli
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  * Copyright (C) 2013 Hugo Heuzard
@@ -38,3 +36,5 @@ val start_position : t -> Lexing.position
 val t_of_position : src:string option -> Lexing.position -> t
 
 val to_string : t -> string
+
+val t_of_debuginfo : Debuginfo.t -> pos:[`Start | `End] -> t option
diff --git a/middle_end/flambda2/to_jsir/reserved.ml → ...flambda2/to_jsir/jsoo_imports/reserved.ml b/middle_end/flambda2/to_jsir/reserved.ml → ...flambda2/to_jsir/jsoo_imports/reserved.ml
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  * Copyright (C) 2013 Hugo Heuzard
@@ -19,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
-open! Jsoo_stdlib
+open! Stdlib
 
 let keyword =
   List.fold_left

diff --git a/middle_end/flambda2/to_jsir/reserved.mli → ...lambda2/to_jsir/jsoo_imports/reserved.mli b/middle_end/flambda2/to_jsir/reserved.mli → ...lambda2/to_jsir/jsoo_imports/reserved.mli
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  * Copyright (C) 2013 Hugo Heuzard
@@ -18,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
-open Jsoo_stdlib
+open Stdlib
 
 val keyword : StringSet.t
 

diff --git a/middle_end/flambda2/to_jsir/jsoo_stdlib.ml → ...d/flambda2/to_jsir/jsoo_imports/stdlib.ml b/middle_end/flambda2/to_jsir/jsoo_stdlib.ml → ...d/flambda2/to_jsir/jsoo_imports/stdlib.ml
@@ -1,5 +1,3 @@
-(* CR selee: clarify licensing permissions *)
-
 (* Js_of_ocaml compiler
  * http://www.ocsigen.org/js_of_ocaml/
  *