Wasm AST: add any.convert_extern

Author: vouillon

compiler/lib-wasm/code_generation.ml

@@ -476,7 +476,8 @@ let rec is_smi e =
   | Br_on_cast_fail _
   | Br_on_null _
   | Try _
-  | ExternConvertAny _ -> false
+  | ExternConvertAny _
+  | AnyConvertExtern _ -> false
   | BinOp ((F32 _ | F64 _), _, _) | RefTest _ | RefEq _ -> true
   | IfExpr (_, _, ift, iff) -> is_smi ift && is_smi iff
 

compiler/lib-wasm/gc_target.ml

@@ -514,7 +514,8 @@ module Value = struct
     | StructGet (_, _, _, e')
     | RefCast (_, e')
     | RefTest (_, e')
-    | ExternConvertAny e' -> effect_free e'
+    | ExternConvertAny e'
+    | AnyConvertExtern e' -> effect_free e'
     | BinOp (_, e1, e2)
     | ArrayNew (_, e1, e2)
     | ArrayNewData (_, _, e1, e2)

compiler/lib-wasm/initialize_locals.ml

@@ -47,8 +47,9 @@ 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'
+  | Br_on_null (_, e')
+  | ExternConvertAny e'
+  | AnyConvertExtern e' -> scan_expression ctx e'
   | BinOp (_, e', e'')
   | ArrayNew (_, e', e'')
   | ArrayNewData (_, _, e', e'')

compiler/lib-wasm/wasm_ast.ml

@@ -171,6 +171,7 @@ type expression =
   | IfExpr of value_type * expression * expression * expression
   | Try of func_type * instruction list * (var * int * value_type) list
   | ExternConvertAny of expression
+  | AnyConvertExtern of expression
 
 and instruction =
   | Drop of expression

compiler/lib-wasm/wasm_output.ml

@@ -702,6 +702,11 @@ end = struct
         output_expression st ch e';
         output_byte ch 0xFB;
         output_byte ch 0x1B
+    | AnyConvertExtern e' ->
+        Feature.require gc;
+        output_expression st ch e';
+        output_byte ch 0xFB;
+        output_byte ch 0x1A
 
   and output_instruction st ch i =
     match i with
@@ -918,8 +923,9 @@ 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
+    | Br_on_null (_, e')
+    | ExternConvertAny e'
+    | AnyConvertExtern e' -> expr_function_references e' set
     | BinOp (_, e', e'')
     | ArrayNew (_, e', e'')
     | ArrayNewData (_, _, e', e'')

compiler/lib-wasm/wat_output.ml

@@ -481,6 +481,7 @@ let expression_or_instructions ctx st in_function =
                       catches))
         ]
     | ExternConvertAny e' -> [ List (Atom "extern.convert_any" :: expression e') ]
+    | AnyConvertExtern e' -> [ List (Atom "any.convert_extern" :: expression e') ]
   and instruction i =
     match i with
     | Drop e -> [ List (Atom "drop" :: expression e) ]