Wasm AST: add br_on_null

Author: vouillon

compiler/lib-wasm/code_generation.ml

@@ -474,6 +474,7 @@ let rec is_smi e =
   | RefNull _
   | Br_on_cast _
   | Br_on_cast_fail _
+  | Br_on_null _
   | Try _
   | ExternConvertAny _ -> false
   | BinOp ((F32 _ | F64 _), _, _) | RefTest _ | RefEq _ -> true

compiler/lib-wasm/gc_target.ml

@@ -528,6 +528,7 @@ module Value = struct
     | Call_ref _
     | Br_on_cast _
     | Br_on_cast_fail _
+    | Br_on_null _
     | Try _ -> false
     | IfExpr (_, e1, e2, e3) -> effect_free e1 && effect_free e2 && effect_free e3
     | ArrayNewFixed (_, l) | StructNew (_, l) -> List.for_all ~f:effect_free l

compiler/lib-wasm/initialize_locals.ml

@@ -47,6 +47,7 @@ let rec scan_expression ctx e =
   | RefTest (_, e')
   | Br_on_cast (_, _, _, e')
   | Br_on_cast_fail (_, _, _, e')
+  | Br_on_null (_, e') -> scan_expression ctx e'
   | ExternConvertAny e' -> scan_expression ctx e'
   | BinOp (_, e', e'')
   | ArrayNew (_, e', e'')

compiler/lib-wasm/wasm_ast.ml

@@ -167,6 +167,7 @@ type expression =
   | RefNull of heap_type
   | Br_on_cast of int * ref_type * ref_type * expression
   | Br_on_cast_fail of int * ref_type * ref_type * expression
+  | Br_on_null of int * expression
   | IfExpr of value_type * expression * expression * expression
   | Try of func_type * instruction list * (var * int * value_type) list
   | ExternConvertAny of expression

compiler/lib-wasm/wasm_output.ml

@@ -645,6 +645,11 @@ end = struct
         output_uint ch i;
         output_heaptype st.type_names ch typ1.typ;
         output_heaptype st.type_names ch typ2.typ
+    | Br_on_null (i, e') ->
+        Feature.require gc;
+        output_expression st ch e';
+        output_byte ch 0xD5;
+        output_uint ch i
     | IfExpr (typ, e1, e2, e3) ->
         output_expression st ch e1;
         output_byte ch 0x04;
@@ -885,6 +890,7 @@ end = struct
     | RefTest (_, e')
     | Br_on_cast (_, _, _, e')
     | Br_on_cast_fail (_, _, _, e')
+    | Br_on_null (_, e') -> expr_function_references e' set
     | ExternConvertAny e' -> expr_function_references e' set
     | BinOp (_, e', e'')
     | ArrayNew (_, e', e'')

compiler/lib-wasm/wat_output.ml

@@ -452,6 +452,8 @@ let expression_or_instructions ctx st in_function =
             :: ref_type st ty'
             :: expression e)
         ]
+    | Br_on_null (i, e) ->
+        [ List (Atom "br_on_null" :: Atom (string_of_int i) :: expression e) ]
     | IfExpr (ty, cond, ift, iff) ->
         [ List
             ((Atom "if" :: block_type st { params = []; result = [ ty ] })