Deterministic runtime representation for extensible types and exceptions (#6570)

diogomqbm · web-flow · commit 7d1fed89b5bf · 2024-02-06T15:51:15.000Z
* feat: changing runtime representation of extension and exceptions

* chore: update changelog

* feat: not exposing map and idmap in caml_exceptions
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - Generic JSX transform: Set default config params for `jsxConfig`. https://github.com/rescript-lang/rescript-compiler/pull/6606
 - Generic JSX transform: Handle namespaced names. https://github.com/rescript-lang/rescript-compiler/pull/6606
 - Fix issue with doc comment in recursive module. https://github.com/rescript-lang/rescript-compiler/pull/6613
+- Fix issue with Exceptions and Extensible types runtime generation. https://github.com/rescript-lang/rescript-compiler/pull/6570
 
 #### :house: Internal
 
diff --git a/jscomp/runtime/caml_exceptions.res b/jscomp/runtime/caml_exceptions.res
@@ -22,6 +22,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+module Map = {
+  type t<'k, 'v>
+  
+  @new external make: unit => t<'k, 'v> = "Map"
+
+  @send external set: (t<'k, 'v>, 'k, 'v) => unit = "set"
+
+  @send external get: (t<'k, 'v>, 'k) => option<'v> = "get"
+}
+
 type t = {@as("RE_EXN_ID") id: string}
 
 /**
@@ -31,11 +41,23 @@ type t = {@as("RE_EXN_ID") id: string}
    This can be inlined as 
    {[ a = caml_set_oo_id([248,"string", caml_oo_last_id++]) ]}
 */
-let id = ref(0)
+let idMap: Map.t<string, int> = Map.make()
 
 let create = (str: string): string => {
-  id.contents = id.contents + 1
-  str ++ ("/" ++ (Obj.magic((id.contents: int)): string))
+  let id = switch idMap->Map.get(str) {
+    | Some(v) => {
+      let id = v + 1
+      idMap->Map.set(str, id)
+      id
+    }
+    | None => {
+      let id = 1
+      idMap->Map.set(str, id)
+      id
+    }
+  }
+
+  str ++ ("/" ++ (Obj.magic((id: int)): string))
 }
 
 /**
diff --git a/jscomp/runtime/caml_exceptions.resi b/jscomp/runtime/caml_exceptions.resi
@@ -0,0 +1,31 @@
+/* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+type t = {@as("RE_EXN_ID") id: string}
+
+let create: string => string
+
+let is_extension: 'a => bool
+
+let exn_slot_name: t => string
diff --git a/jscomp/runtime/release.ninja b/jscomp/runtime/release.ninja
@@ -19,6 +19,8 @@ o runtime/caml_array.cmj : cc_cmi runtime/caml_array.res | runtime/caml_array.cm
 o runtime/caml_array.cmi : cc runtime/caml_array.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.res | runtime/caml_bytes.cmi
 o runtime/caml_bytes.cmi : cc runtime/caml_bytes.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
+o runtime/caml_exceptions.cmj : cc_cmi runtime/caml_exceptions.res | runtime/caml_exceptions.cmi runtime/js.cmj
+o runtime/caml_exceptions.cmi : cc runtime/caml_exceptions.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_float.cmj : cc_cmi runtime/caml_float.res | runtime/caml_float.cmi runtime/caml_float_extern.cmj
 o runtime/caml_float.cmi : cc runtime/caml_float.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
@@ -50,7 +52,6 @@ o runtime/caml_string.cmi : cc runtime/caml_string.resi | runtime/bs_stdlib_mini
 o runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.res | runtime/caml_array_extern.cmj runtime/caml_sys.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 o runtime/caml_sys.cmi : cc runtime/caml_sys.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj : cc runtime/caml_array_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj : cc runtime/caml_exceptions.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc runtime/caml_external_polyfill.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj : cc runtime/caml_int64_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
@@ -59,4 +60,4 @@ o runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runti
 o runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.res | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
-o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml.cmi runtime/caml.cmj runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
+o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml.cmi runtime/caml.cmj runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
diff --git a/lib/es6/caml_exceptions.js b/lib/es6/caml_exceptions.js
@@ -1,13 +1,20 @@
 
 
 
-var id = {
-  contents: 0
-};
+var idMap = new Map();
 
 function create(str) {
-  id.contents = id.contents + 1 | 0;
-  return str + ("/" + id.contents);
+  var v = idMap.get(str);
+  var id;
+  if (v !== undefined) {
+    var id$1 = v + 1 | 0;
+    idMap.set(str, id$1);
+    id = id$1;
+  } else {
+    idMap.set(str, 1);
+    id = 1;
+  }
+  return str + ("/" + id);
 }
 
 function is_extension(e) {
@@ -23,9 +30,8 @@ function exn_slot_name(x) {
 }
 
 export {
-  id ,
   create ,
   is_extension ,
   exn_slot_name ,
 }
-/* No side effect */
+/* idMap Not a pure module */
diff --git a/lib/es6/caml_js_exceptions.js b/lib/es6/caml_js_exceptions.js
@@ -28,4 +28,4 @@ export {
   internalToOCamlException ,
   as_js_exn ,
 }
-/* No side effect */
+/* Caml_exceptions Not a pure module */
diff --git a/lib/js/caml_exceptions.js b/lib/js/caml_exceptions.js
@@ -1,13 +1,20 @@
 'use strict';
 
 
-var id = {
-  contents: 0
-};
+var idMap = new Map();
 
 function create(str) {
-  id.contents = id.contents + 1 | 0;
-  return str + ("/" + id.contents);
+  var v = idMap.get(str);
+  var id;
+  if (v !== undefined) {
+    var id$1 = v + 1 | 0;
+    idMap.set(str, id$1);
+    id = id$1;
+  } else {
+    idMap.set(str, 1);
+    id = 1;
+  }
+  return str + ("/" + id);
 }
 
 function is_extension(e) {
@@ -22,8 +29,7 @@ function exn_slot_name(x) {
   return x.RE_EXN_ID;
 }
 
-exports.id = id;
 exports.create = create;
 exports.is_extension = is_extension;
 exports.exn_slot_name = exn_slot_name;
-/* No side effect */
+/* idMap Not a pure module */
diff --git a/lib/js/caml_js_exceptions.js b/lib/js/caml_js_exceptions.js
@@ -26,4 +26,4 @@ function as_js_exn(exn) {
 exports.$$Error = $$Error;
 exports.internalToOCamlException = internalToOCamlException;
 exports.as_js_exn = as_js_exn;
-/* No side effect */
+/* Caml_exceptions Not a pure module */

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@ export {`
`28`	`28`	`internalToOCamlException ,`
`29`	`29`	`as_js_exn ,`
`30`	`30`	`}`
`31`		`-/* No side effect */`
	`31`	`+/* Caml_exceptions Not a pure module */`