From 4e2bd77d2c6a6d0791c2b30a1b7cb3524a148800 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond
Date: Sun, 30 Aug 2020 11:05:46 +0200
Subject: Turn Ksequence into a unary opcode, as its binary structure was never
 used.

---
 kernel/vmbytecodes.ml  |  6 +++---
 kernel/vmbytecodes.mli |  2 +-
 kernel/vmbytegen.ml    | 16 ++++++++--------
 kernel/vmemitcodes.ml  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kernel/vmbytecodes.ml b/kernel/vmbytecodes.ml
index 2cef6e3359..4977aec00a 100644
--- a/kernel/vmbytecodes.ml
+++ b/kernel/vmbytecodes.ml
@@ -56,7 +56,7 @@ type instruction =
   | Kfield of int
   | Ksetfield of int
   | Kstop
-  | Ksequence of bytecodes * bytecodes
+  | Ksequence of bytecodes
   | Kproj of Projection.Repr.t
   | Kensurestackcapacity of int
   | Kbranch of Label.t                  (* jump to label *)
@@ -157,7 +157,7 @@ and pp_bytecodes c =
   | Klabel lbl :: c ->
         str "L" ++ int lbl ++ str ":" ++ fnl () ++
         pp_bytecodes c
-  | Ksequence (l1, l2) :: c ->
-      pp_bytecodes l1 ++ pp_bytecodes l2 ++  pp_bytecodes c
+  | Ksequence l :: c ->
+      pp_bytecodes l ++  pp_bytecodes c
   | i :: c ->
       pp_instr i ++ fnl () ++ pp_bytecodes c
diff --git a/kernel/vmbytecodes.mli b/kernel/vmbytecodes.mli
index 138778eac4..003a77ab78 100644
--- a/kernel/vmbytecodes.mli
+++ b/kernel/vmbytecodes.mli
@@ -54,7 +54,7 @@ type instruction =
   | Kfield of int                       (** accu = accu[n] *)
   | Ksetfield of int                    (** accu[n] = sp[0] ; sp = pop sp *)
   | Kstop
-  | Ksequence of bytecodes * bytecodes
+  | Ksequence of bytecodes
   | Kproj of Projection.Repr.t
   | Kensurestackcapacity of int
 
diff --git a/kernel/vmbytegen.ml b/kernel/vmbytegen.ml
index 5f6d19884f..70c92fd8f0 100644
--- a/kernel/vmbytegen.ml
+++ b/kernel/vmbytegen.ml
@@ -579,7 +579,7 @@ let rec compile_lam env cenv lam sz cont =
      let cont_fun =
        ensure_stack_capacity (compile_lam env r_fun body arity) [Kreturn arity]
      in
-     fun_code := [Ksequence(add_grab arity lbl_fun cont_fun,!fun_code)];
+     fun_code := Ksequence (add_grab arity lbl_fun cont_fun) :: !fun_code;
      let fv = fv r_fun in
      compile_fv cenv fv.fv_rev sz (Kclosure(lbl_fun,fv.size) :: cont)
 
@@ -602,7 +602,7 @@ let rec compile_lam env cenv lam sz cont =
         in
         let lbl,fcode = label_code fcode in
         lbl_types.(i) <- lbl;
-        fun_code := [Ksequence(fcode,!fun_code)]
+        fun_code := Ksequence fcode :: !fun_code
       done;
       (* Compiling bodies *)
       for i = 0 to ndef - 1 do
@@ -615,7 +615,7 @@ let rec compile_lam env cenv lam sz cont =
         let lbl = Label.create () in
         lbl_bodies.(i) <- lbl;
         let fcode =  add_grabrec rec_args.(i) arity lbl cont1 in
-        fun_code := [Ksequence(fcode,!fun_code)]
+        fun_code := Ksequence fcode :: !fun_code
       done;
       let fv = !rfv in
       compile_fv cenv fv.fv_rev sz
@@ -635,7 +635,7 @@ let rec compile_lam env cenv lam sz cont =
         in
         let lbl,fcode = label_code fcode in
         lbl_types.(i) <- lbl;
-        fun_code := [Ksequence(fcode,!fun_code)]
+        fun_code := Ksequence fcode :: !fun_code
       done;
       (* Compiling bodies *)
       for i = 0 to ndef - 1 do
@@ -650,7 +650,7 @@ let rec compile_lam env cenv lam sz cont =
         in
         let cont = ensure_stack_capacity comp arity in
         lbl_bodies.(i) <- lbl;
-        fun_code := [Ksequence(add_grab (arity+1) lbl cont,!fun_code)];
+        fun_code := Ksequence (add_grab (arity+1) lbl cont) :: !fun_code;
       done;
       let fv = !rfv in
       set_max_stack_size (sz + fv.size + ndef + 2);
@@ -674,7 +674,7 @@ let rec compile_lam env cenv lam sz cont =
         ensure_stack_capacity (compile_lam env cenv t sz) [Kpop sz; Kstop]
       in
       let lbl_typ,fcode = label_code fcode in
-      fun_code := [Ksequence(fcode,!fun_code)];
+      fun_code := Ksequence fcode :: !fun_code;
       (* Compilation of the branches *)
       let lbl_sw = Label.create () in
       let sz_b,branch,is_tailcall =
@@ -775,7 +775,7 @@ let rec compile_lam env cenv lam sz cont =
       if Int.equal nparams 0 then cont
       else comp_args (compile_lam env) cenv (Array.sub args 0 nparams) (sz + nargs) (Kpush::cont)
     in
-    fun_code := [Ksequence(default, !fun_code)];
+    fun_code := Ksequence default :: !fun_code;
     comp_args (compile_lam env) cenv (Array.sub args nparams nargs) sz (Kcamlprim (op, lbl_default) :: cont)
 
   | Lprim (kn, op, args) ->
@@ -865,7 +865,7 @@ let compile ~fail_on_error ?universes:(universes=0) env c =
           ensure_stack_capacity (compile_lam env r_fun body full_arity)
                          [Kreturn full_arity]
         in
-        fun_code := [Ksequence(add_grab full_arity lbl_fun cont_fun,!fun_code)];
+        fun_code := Ksequence (add_grab full_arity lbl_fun cont_fun) :: !fun_code;
         let fv = fv r_fun in
         let init_code =
           ensure_stack_capacity (compile_fv cenv fv.fv_rev 0)
diff --git a/kernel/vmemitcodes.ml b/kernel/vmemitcodes.ml
index ae2399c872..0bd3375169 100644
--- a/kernel/vmemitcodes.ml
+++ b/kernel/vmemitcodes.ml
@@ -390,8 +390,8 @@ let rec emit env insns remaining = match insns with
       emit env c remaining
   | Kpop n :: Kjump :: c ->
       out env opRETURN; out_int env n; emit env c remaining
-  | Ksequence(c1,c2)::c ->
-      emit env c1 (c2::c::remaining)
+  | Ksequence c1 :: c ->
+      emit env c1 (c :: remaining)
   (* Default case *)
   | instr :: c ->
       emit_instr env instr; emit env c remaining
-- 
cgit v1.2.3