Skip to content

Commit 94bee37

Browse files
authored
Compiler: fix for ocaml 5.2 (#1549)
1 parent 5ba7936 commit 94bee37

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

compiler/lib/parse_bytecode.ml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2429,10 +2429,17 @@ and compile infos pc state instrs =
24292429
func
24302430
Var.print
24312431
arg;
2432+
let state =
2433+
match Ocaml_version.v with
2434+
| `V4_08 | `V4_09 | `V4_10 | `V4_11 | `V4_12 | `V4_13 | `V4_14 | `V5_00 | `V5_01
2435+
-> State.pop 2 state
2436+
| `V5_02 -> State.pop 3 state
2437+
in
2438+
24322439
compile
24332440
infos
24342441
(pc + 1)
2435-
(State.pop 2 state)
2442+
state
24362443
((Let (x, Prim (Extern "%resume", [ Pv stack; Pv func; Pv arg ])), loc)
24372444
:: instrs)
24382445
| RESUMETERM ->

runtime/zstd.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -648,13 +648,25 @@ return function decompress(dat, buf) {
648648

649649

650650
//Provides: caml_decompress_input
651-
//Version: > 5.1.0
651+
//Version: < 5.1.0
652652
var caml_decompress_input = null
653653

654654
//Provides: caml_decompress_input
655-
//Version: < 5.1.0
655+
//Version: >= 5.1.0
656+
//Version: < 5.1.1
657+
//Requires: zstd_decompress
658+
var caml_decompress_input = zstd_decompress;
659+
660+
//Provides: caml_decompress_input
661+
//Version: >= 5.1.1
662+
//Version: < 5.2.0
656663
var caml_decompress_input = null
657664

665+
//Provides: caml_decompress_input
666+
//Version: >= 5.2
667+
//Requires: zstd_decompress
668+
var caml_decompress_input = zstd_decompress;
669+
658670
//Provides: caml_zstd_initialize
659671
//Requires: caml_decompress_input
660672
//Requires: zstd_decompress
@@ -664,8 +676,3 @@ function caml_zstd_initialize(unit) {
664676
return 1
665677
}
666678

667-
//Provides: caml_decompress_input
668-
//Version: >= 5.1
669-
//Version: < 5.1.1
670-
//Requires: zstd_decompress
671-
var caml_decompress_input = zstd_decompress;

0 commit comments

Comments
 (0)