Remove obsolete hack

Author: vouillon

compiler/lib-wasm/code_generation.ml

@@ -417,71 +417,6 @@ let is_small_constant e =
   | W.GlobalGet name -> global_is_constant name
   | _ -> return false
 
-let un_op_is_smi op =
-  match op with
-  | W.Clz | Ctz | Popcnt | Eqz -> true
-  | TruncSatF64 _ | ReinterpretF -> false
-
-let bin_op_is_smi (op : W.int_bin_op) =
-  match op with
-  | W.Add | Sub | Mul | Div _ | Rem _ | And | Or | Xor | Shl | Shr _ | Rotl | Rotr ->
-      false
-  | Eq | Ne | Lt _ | Gt _ | Le _ | Ge _ -> true
-
-let rec is_smi e =
-  match e with
-  | W.Const (I32 i) -> Int32.equal (Arith.wrap31 i) i
-  | UnOp ((I32 op | I64 op), _) -> un_op_is_smi op
-  | BinOp ((I32 op | I64 op), _, _) -> bin_op_is_smi op
-  | I31Get (S, _) -> true
-  | I31Get (U, _)
-  | Const (I64 _ | F32 _ | F64 _)
-  | UnOp ((F32 _ | F64 _), _)
-  | I32WrapI64 _
-  | I64ExtendI32 _
-  | F32DemoteF64 _
-  | F64PromoteF32 _
-  | LocalGet _
-  | LocalTee _
-  | GlobalGet _
-  | BlockExpr _
-  | Call _
-  | Seq _
-  | Pop _
-  | RefFunc _
-  | Call_ref _
-  | RefI31 _
-  | ArrayNew _
-  | ArrayNewFixed _
-  | ArrayNewData _
-  | ArrayGet _
-  | ArrayLen _
-  | StructNew _
-  | StructGet _
-  | RefCast _
-  | RefNull _
-  | Br_on_cast _
-  | Br_on_cast_fail _
-  | Br_on_null _
-  | Try _
-  | ExternConvertAny _
-  | AnyConvertExtern _ -> false
-  | BinOp ((F32 _ | F64 _), _, _) | RefTest _ | RefEq _ -> true
-  | IfExpr (_, _, ift, iff) -> is_smi ift && is_smi iff
-
-let get_i31_value x st =
-  match st.instrs with
-  | LocalSet (x', RefI31 e) :: rem when Code.Var.equal x x' && is_smi e ->
-      let x = Var.fresh () in
-      let x, st = add_var ~typ:I32 x st in
-      Some x, { st with instrs = LocalSet (x', RefI31 (LocalTee (x, e))) :: rem }
-  | Event loc :: LocalSet (x', RefI31 e) :: rem when Code.Var.equal x x' && is_smi e ->
-      let x = Var.fresh () in
-      let x, st = add_var ~typ:I32 x st in
-      ( Some x
-      , { st with instrs = Event loc :: LocalSet (x', RefI31 (LocalTee (x, e))) :: rem } )
-  | _ -> None, st
-
 let load x =
   let* x = var x in
   match x with

compiler/lib-wasm/code_generation.mli

@@ -139,8 +139,6 @@ val define_var : Wasm_ast.var -> expression -> unit t
 
 val is_small_constant : Wasm_ast.expression -> bool t
 
-val get_i31_value : Wasm_ast.var -> Wasm_ast.var option t
-
 val event : Parse_info.t -> unit t
 
 val no_event : unit t

compiler/lib-wasm/gc_target.ml

@@ -443,13 +443,7 @@ module Value = struct
 
   let check_is_not_zero i =
     let* i = i in
-    match i with
-    | W.LocalGet x -> (
-        let* x_opt = get_i31_value x in
-        match x_opt with
-        | Some x' -> return (W.LocalGet x')
-        | None -> return (W.UnOp (I32 Eqz, RefEq (i, W.RefI31 (Const (I32 0l))))))
-    | _ -> return (W.UnOp (I32 Eqz, RefEq (i, W.RefI31 (Const (I32 0l)))))
+    return (W.UnOp (I32 Eqz, RefEq (i, W.RefI31 (Const (I32 0l)))))
 
   let check_is_int i =
     let* i = i in