Skip to content

Fix marshal sharing strings #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 27, 2023
Merged

Fix marshal sharing strings #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c396a86
Runtime: fix marshal sharing strings
hhugo Apr 26, 2023
bc6fd5a
Tests: new test, marshaling with sharing of strings
hhugo Apr 26, 2023
8e75371
fix
hhugo Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* Compiler: reduce memory consumption when parsing js
* Compiler: parsing js can return a list of token, the list was sometime incorrect
* Sourcemap: stop producing sourcemaps mappings with negative lines or columns
* Runtime: fix marshalling with sharing and string (use-js-string)

# 5.1.1 (2023-03-15) - Lille
## Bug fixes
Expand Down
11 changes: 11 additions & 0 deletions compiler/tests-jsoo/test_marshal.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,14 @@ let%expect_test _ =
in
Printf.printf "%s ... (%d)\n" (String.sub s 0 20) (String.length s);
[%expect {| cccccccccccccccccccc ... (10000) |}]

let%expect_test "test sharing of string" =
let s = "AString" in
let p = s, s in
let obj = [ p; p ] in
Printf.printf "%S" (Marshal.to_string s []);
[%expect
{| "\132\149\166\190\000\000\000\b\000\000\000\001\000\000\000\003\000\000\000\002'AString" |}];
Printf.printf "%S" (Marshal.to_string obj []);
[%expect
{| "\132\149\166\190\000\000\000\016\000\000\000\004\000\000\000\012\000\000\000\011\160\160'AString\004\001\160\004\003@" |}]
5 changes: 3 additions & 2 deletions runtime/marshal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ function caml_marshal_data_size (s, ofs) {

//Provides: MlObjectTable
var MlObjectTable;
if (typeof globalThis.WeakMap === 'undefined') {
if (typeof globalThis.Map === 'undefined') {
MlObjectTable = function() {
/* polyfill (using linear search) */
function NaiveLookup(objs) { this.objs = objs; }
Expand All @@ -572,7 +572,7 @@ if (typeof globalThis.WeakMap === 'undefined') {
}
else {
MlObjectTable = function MlObjectTable() {
this.objs = []; this.lookup = new globalThis.WeakMap();
this.objs = []; this.lookup = new globalThis.Map();
};
}

Expand Down Expand Up @@ -715,6 +715,7 @@ var caml_output_val = function (){
writer.size_32 += 1 + (((len + 4) / 4)|0);
writer.size_64 += 1 + (((len + 8) / 8)|0);
} else if (caml_is_ml_string(v)) {
if (memo(v)) return;
var len = caml_ml_string_length(v);
if (len < 0x20)
writer.write (8, 0x20 /*cst.PREFIX_SMALL_STRING*/ + len);
Expand Down