Compiler/Toplevel: restore runtime aliases inside toplevel

Author: hhugo

compiler/lib-dynlink/js_of_ocaml_compiler_dynlink.ml

@@ -12,6 +12,8 @@ type bytecode_sections =
 
 external get_bytecode_sections : unit -> bytecode_sections = "jsoo_get_bytecode_sections"
 
+external get_runtime_aliases : unit -> (string * string) list = "jsoo_get_runtime_aliases"
+
 external toplevel_init_compile :
   (string -> Instruct.debug_event list array -> unit -> J.t) -> unit
   = "jsoo_toplevel_init_compile"
@@ -37,10 +39,12 @@ let () =
   (match Sys.backend_type with
   | Sys.Other "js_of_ocaml" -> Config.set_target `JavaScript
   | Sys.(Native | Bytecode | Other _) -> failwith "Expected backend `js_of_ocaml`");
+  let aliases = get_runtime_aliases () in
   let global = J.pure_js_expr "globalThis" in
   Config.Flag.set "use-js-string" (Jsoo_runtime.Sys.Config.use_js_string ());
   Config.set_effects_backend (Jsoo_runtime.Sys.Config.effects ());
   Linker.reset ();
+  List.iter aliases ~f:(fun (a, b) -> Primitive.alias a b);
   (* this needs to stay synchronized with toplevel.js *)
   let toplevel_compile (s : string) (debug : Instruct.debug_event list array) :
       unit -> J.t =

compiler/lib/parse_bytecode.ml

@@ -2645,10 +2645,12 @@ let from_exe
       let sections = { symb = symbols; crcs; prim = primitives; dlpt = [] } in
       let gdata = Var.fresh () in
       let need_gdata = ref false in
+      let aliases = Primitive.aliases () in
       let infos =
         [ "sections", Constants.parse (Obj.repr sections)
         ; "symbols", Constants.parse (Obj.repr symbols_array)
         ; "prim_count", Int (Targetint.of_int_exn (Array.length globals.primitives))
+        ; "aliases", Constants.parse (Obj.repr aliases)
         ]
       in
       let body =
@@ -3073,10 +3075,12 @@ let link_info ~symbols ~primitives ~crcs =
   let body =
     (* Include linking information *)
     let sections = { symb = symbols; crcs; prim = primitives; dlpt = [] } in
+    let aliases = Primitive.aliases () in
     let infos =
       [ "sections", Constants.parse (Obj.repr sections)
       ; "symbols", Constants.parse (Obj.repr symbols_array)
       ; "prim_count", Int (Targetint.of_int_exn (List.length primitives))
+      ; "aliases", Constants.parse (Obj.repr aliases)
       ]
     in
     let body =

compiler/lib/primitive.ml

@@ -19,9 +19,9 @@
  *)
 open! Stdlib
 
-let aliases = Hashtbl.create 17
+let aliases_ = Hashtbl.create 17
 
-let rec resolve nm = try resolve (Hashtbl.find aliases nm) with Not_found -> nm
+let rec resolve nm = try resolve (Hashtbl.find aliases_ nm) with Not_found -> nm
 
 (****)
 
@@ -109,7 +109,9 @@ let register p k kargs arity =
 let alias nm nm' =
   add_external nm';
   add_external nm;
-  Hashtbl.replace aliases nm nm'
+  Hashtbl.replace aliases_ nm nm'
+
+let aliases () = Hashtbl.to_seq aliases_ |> List.of_seq
 
 let named_values = ref StringSet.empty
 
@@ -121,5 +123,5 @@ let reset () =
   Hashtbl.clear kinds;
   Hashtbl.clear kind_args_tbl;
   Hashtbl.clear arities;
-  Hashtbl.clear aliases;
+  Hashtbl.clear aliases_;
   named_values := StringSet.empty

compiler/lib/primitive.mli

@@ -64,6 +64,8 @@ val has_arity : string -> int -> bool
 
 val alias : string -> string -> unit
 
+val aliases : unit -> (string * string) list
+
 val resolve : string -> string
 
 val add_external : string -> unit

compiler/tests-check-prim/main.4.14.output

@@ -134,6 +134,7 @@ caml_set_static_env
 
 From +toplevel.js:
 caml_dynlink_get_bytecode_sections
+jsoo_get_runtime_aliases
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

compiler/tests-check-prim/main.5.2.output

@@ -130,6 +130,7 @@ caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
 caml_get_section_table
+jsoo_get_runtime_aliases
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

compiler/tests-check-prim/main.5.3.output

@@ -128,6 +128,7 @@ caml_set_static_env
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
+jsoo_get_runtime_aliases
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

compiler/tests-check-prim/unix-Unix.4.14.output

@@ -210,6 +210,7 @@ caml_set_static_env
 
 From +toplevel.js:
 caml_dynlink_get_bytecode_sections
+jsoo_get_runtime_aliases
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

compiler/tests-check-prim/unix-Unix.5.2.output

@@ -206,6 +206,7 @@ caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
 caml_get_section_table
+jsoo_get_runtime_aliases
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc
 

compiler/tests-check-prim/unix-Unix.5.3.output

@@ -204,6 +204,7 @@ caml_set_static_env
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
+jsoo_get_runtime_aliases
 jsoo_toplevel_init_compile
 jsoo_toplevel_init_reloc