summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/binaryen.js/expressions.js4
-rw-r--r--test/example/c-api-kitchen-sink.c4
-rw-r--r--test/example/c-api-kitchen-sink.txt4
-rw-r--r--test/lit/ctor-eval/extern.wast12
-rw-r--r--test/lit/exec/i31.wast2
-rw-r--r--test/lit/extern-conversions.wast39
-rw-r--r--test/lit/passes/gufa-extern.wast16
-rw-r--r--test/lit/passes/optimize-instructions-gc-extern.wast20
-rw-r--r--test/lit/passes/optimize-instructions-gc.wast4
-rw-r--r--test/lit/passes/type-generalizing.wast16
-rw-r--r--test/lit/passes/type-ssa.wast16
-rw-r--r--test/lit/wat-kitchen-sink.wast8
-rw-r--r--test/spec/ref_test.wast12
13 files changed, 88 insertions, 69 deletions
diff --git a/test/binaryen.js/expressions.js b/test/binaryen.js/expressions.js
index 16e8e8c4e..bd8ec6793 100644
--- a/test/binaryen.js/expressions.js
+++ b/test/binaryen.js/expressions.js
@@ -1451,7 +1451,7 @@ console.log("# RefAs");
assert(theRefAs.value === value);
assert(theRefAs.type !== binaryen.i32); // TODO: === (ref any)
- theRefAs.op = op = binaryen.Operations.RefAsExternExternalize;
+ theRefAs.op = op = binaryen.Operations.RefAsExternConvertAny;
assert(theRefAs.op === op);
theRefAs.op = op = binaryen.Operations.RefAsNonNull;
theRefAs.value = value = module.local.get(2, binaryen.anyref);
@@ -1467,7 +1467,7 @@ console.log("# RefAs");
"(ref.as_non_null\n (local.get $2)\n)\n"
);
- // TODO: extern.externalize and extern.internalize
+ // TODO: extern.convert_any and any.convert_extern
module.dispose();
})();
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
index efd343be9..cd305c69b 100644
--- a/test/example/c-api-kitchen-sink.c
+++ b/test/example/c-api-kitchen-sink.c
@@ -1050,10 +1050,10 @@ void test_core() {
BinaryenRefAsNonNull(),
BinaryenRefNull(module, BinaryenTypeNullref())),
BinaryenRefAs(module,
- BinaryenRefAsExternInternalize(),
+ BinaryenRefAsAnyConvertExtern(),
BinaryenRefNull(module, BinaryenTypeNullExternref())),
BinaryenRefAs(module,
- BinaryenRefAsExternExternalize(),
+ BinaryenRefAsExternConvertAny(),
BinaryenRefNull(module, BinaryenTypeNullref())),
// Exception handling
BinaryenTry(module, NULL, tryBody, catchTags, 1, catchBodies, 2, NULL),
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index 5ba35fb0e..140d8e948 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -2137,12 +2137,12 @@ BinaryenFeatureAll: 262143
)
)
(drop
- (extern.internalize
+ (any.convert_extern
(ref.null noextern)
)
)
(drop
- (extern.externalize
+ (extern.convert_any
(ref.null none)
)
)
diff --git a/test/lit/ctor-eval/extern.wast b/test/lit/ctor-eval/extern.wast
index 9a8779abf..9591f9034 100644
--- a/test/lit/ctor-eval/extern.wast
+++ b/test/lit/ctor-eval/extern.wast
@@ -16,7 +16,7 @@
;; This will remain almost the same, even though we eval it, since the
;; serialization of an externalized i31 is what is written here. But the add
;; will be evalled out.
- (extern.externalize
+ (extern.convert_any
(ref.i31
(i32.add
(i32.const 41)
@@ -28,7 +28,7 @@
(func $test2 (result externref)
;; This will be evalled into an externalization of a global.get.
- (extern.externalize
+ (extern.convert_any
(array.new_fixed $array 3
(i32.const 1)
(i32.const 2)
@@ -40,7 +40,7 @@
(func $test3 (result anyref)
;; This will add a global that contains an externalization operation.
(struct.new $struct
- (extern.externalize
+ (extern.convert_any
(ref.i31
(i32.const 1)
)
@@ -60,7 +60,7 @@
;; CHECK-NEXT: ))
;; CHECK: (global $ctor-eval$global_1 (ref $struct) (struct.new $struct
-;; CHECK-NEXT: (extern.externalize
+;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (ref.i31
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
@@ -74,7 +74,7 @@
;; CHECK: (export "test3" (func $test3_5))
;; CHECK: (func $test1_3 (type $2) (result externref)
-;; CHECK-NEXT: (extern.externalize
+;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (ref.i31
;; CHECK-NEXT: (i32.const 42)
;; CHECK-NEXT: )
@@ -82,7 +82,7 @@
;; CHECK-NEXT: )
;; CHECK: (func $test2_4 (type $2) (result externref)
-;; CHECK-NEXT: (extern.externalize
+;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
diff --git a/test/lit/exec/i31.wast b/test/lit/exec/i31.wast
index 0833d490d..807641d24 100644
--- a/test/lit/exec/i31.wast
+++ b/test/lit/exec/i31.wast
@@ -91,7 +91,7 @@
;; CHECK-NEXT: [fuzz-exec] note result: return-exted-i31 => i31ref(42)
(func $return-exted-i31 (export "return-exted-i31") (result externref)
;; Even an externalized i31 is logged out using its integer value.
- (extern.externalize
+ (extern.convert_any
(ref.i31
(i32.const 42)
)
diff --git a/test/lit/extern-conversions.wast b/test/lit/extern-conversions.wast
index a3e18a2ac..f84097557 100644
--- a/test/lit/extern-conversions.wast
+++ b/test/lit/extern-conversions.wast
@@ -11,29 +11,48 @@
;; CHECK: (type $1 (func (param externref) (result anyref)))
- ;; CHECK: (export "ext" (func $extern.externalize))
+ ;; CHECK: (type $2 (func (param externref) (result externref)))
- ;; CHECK: (export "int" (func $extern.internalize))
+ ;; CHECK: (export "ext" (func $extern.convert_any))
- ;; CHECK: (func $extern.externalize (type $0) (param $0 (ref any)) (result (ref extern))
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK: (export "int" (func $any.convert_extern))
+
+ ;; CHECK: (export "legacy" (func $legacy_notation))
+
+ ;; CHECK: (func $extern.convert_any (type $0) (param $0 (ref any)) (result (ref extern))
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
- (func $extern.externalize (export "ext") (param $x (ref any)) (result (ref extern))
- (extern.externalize
+ (func $extern.convert_any (export "ext") (param $x (ref any)) (result (ref extern))
+ (extern.convert_any
(local.get $x)
)
)
- ;; CHECK: (func $extern.internalize (type $1) (param $0 externref) (result anyref)
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK: (func $any.convert_extern (type $1) (param $0 externref) (result anyref)
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
- (func $extern.internalize (export "int") (param $x (ref null extern)) (result (ref null any))
- (extern.internalize
+ (func $any.convert_extern (export "int") (param $x (ref null extern)) (result (ref null any))
+ (any.convert_extern
(local.get $x)
)
)
+
+ ;; CHECK: (func $legacy_notation (type $2) (param $0 externref) (result externref)
+ ;; CHECK-NEXT: (extern.convert_any
+ ;; CHECK-NEXT: (any.convert_extern
+ ;; CHECK-NEXT: (local.get $0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $legacy_notation (export "legacy") (param $x (ref null extern)) (result (ref null extern))
+ (extern.externalize
+ (extern.internalize
+ (local.get $x)
+ )
+ )
+ )
)
diff --git a/test/lit/passes/gufa-extern.wast b/test/lit/passes/gufa-extern.wast
index 7cc604c76..ebb97cc59 100644
--- a/test/lit/passes/gufa-extern.wast
+++ b/test/lit/passes/gufa-extern.wast
@@ -9,13 +9,13 @@
;; CHECK: (func $externals (type $0) (param $ext externref) (param $any anyref)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.cast (ref struct)
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $ext)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $any)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -25,13 +25,13 @@
;; exported.
(drop
(ref.cast (ref struct)
- (extern.internalize
+ (any.convert_extern
(local.get $ext)
)
)
)
(drop
- (extern.externalize
+ (extern.convert_any
(local.get $any)
)
)
@@ -41,7 +41,7 @@
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (block ;; (replaces unreachable RefCast we can't emit)
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -49,7 +49,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -59,13 +59,13 @@
;; unreachable.
(drop
(ref.cast (ref struct)
- (extern.internalize
+ (any.convert_extern
(local.get $ext)
)
)
)
(drop
- (extern.externalize
+ (extern.convert_any
(local.get $any)
)
)
diff --git a/test/lit/passes/optimize-instructions-gc-extern.wast b/test/lit/passes/optimize-instructions-gc-extern.wast
index 558665171..658b2b115 100644
--- a/test/lit/passes/optimize-instructions-gc-extern.wast
+++ b/test/lit/passes/optimize-instructions-gc-extern.wast
@@ -3,53 +3,53 @@
;; RUN: | filecheck %s
(module
- ;; CHECK: (func $extern.externalize (type $0) (param $x anyref) (param $y externref)
+ ;; CHECK: (func $extern.convert_any (type $0) (param $x anyref) (param $y externref)
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (ref.as_non_null
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $y)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (ref.as_non_null
;; CHECK-NEXT: (local.get $y)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
- (func $extern.externalize (export "ext") (param $x (ref null any)) (param $y (ref null extern))
+ (func $extern.convert_any (export "ext") (param $x (ref null any)) (param $y (ref null extern))
;; We should not change anything here, and also not hit an internal error.
(drop
- (extern.externalize
+ (extern.convert_any
(local.get $x)
)
)
(drop
- (extern.externalize
+ (extern.convert_any
(ref.as_non_null
(local.get $x)
)
)
)
(drop
- (extern.internalize
+ (any.convert_extern
(local.get $y)
)
)
(drop
- (extern.internalize
+ (any.convert_extern
(ref.as_non_null
(local.get $y)
)
diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast
index 14db70f3b..60fca14fc 100644
--- a/test/lit/passes/optimize-instructions-gc.wast
+++ b/test/lit/passes/optimize-instructions-gc.wast
@@ -2756,7 +2756,7 @@
;; CHECK: (func $cast-internalized-extern (type $43) (param $externref externref)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.cast (ref $A)
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $externref)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -2768,7 +2768,7 @@
;; the cast cannot succeed.
(drop
(ref.cast (ref $A)
- (extern.internalize
+ (any.convert_extern
(local.get $externref)
)
)
diff --git a/test/lit/passes/type-generalizing.wast b/test/lit/passes/type-generalizing.wast
index 8278549d0..344509794 100644
--- a/test/lit/passes/type-generalizing.wast
+++ b/test/lit/passes/type-generalizing.wast
@@ -770,7 +770,7 @@
;; CHECK-NEXT: (local.set $var
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $var)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -780,7 +780,7 @@
(local.get $x)
)
;; Require that typeof($var) <: externref.
- (extern.internalize
+ (any.convert_extern
(local.get $var)
)
)
@@ -790,7 +790,7 @@
;; CHECK-NEXT: (local.set $var
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $var)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -800,7 +800,7 @@
(local.get $x)
)
;; Require that typeof($var) <: (ref extern).
- (extern.internalize
+ (any.convert_extern
(local.get $var)
)
)
@@ -812,7 +812,7 @@
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $var)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -824,7 +824,7 @@
)
)
;; Require that typeof($var) <: anyref.
- (extern.externalize
+ (extern.convert_any
(local.get $var)
)
)
@@ -836,7 +836,7 @@
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $var)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -848,7 +848,7 @@
)
)
;; Require that typeof($var) <: anyref.
- (extern.externalize
+ (extern.convert_any
(local.get $var)
)
)
diff --git a/test/lit/passes/type-ssa.wast b/test/lit/passes/type-ssa.wast
index 771b4b9ae..277e2a2ff 100644
--- a/test/lit/passes/type-ssa.wast
+++ b/test/lit/passes/type-ssa.wast
@@ -382,15 +382,15 @@
;; CHECK: (func $0 (type $2) (param $param anyref)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (struct.new $struct
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (global.get $g)
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (extern.internalize
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (any.convert_extern
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (global.get $g)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $param)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
@@ -400,17 +400,17 @@
(drop
(struct.new $struct
;; An externalized global.
- (extern.externalize
+ (extern.convert_any
(global.get $g)
)
;; An externalized and then internalized global.
- (extern.internalize
- (extern.externalize
+ (any.convert_extern
+ (extern.convert_any
(global.get $g)
)
)
;; An externalized parameter.
- (extern.externalize
+ (extern.convert_any
(local.get $param)
)
)
diff --git a/test/lit/wat-kitchen-sink.wast b/test/lit/wat-kitchen-sink.wast
index 71484977a..730d9773e 100644
--- a/test/lit/wat-kitchen-sink.wast
+++ b/test/lit/wat-kitchen-sink.wast
@@ -4416,27 +4416,27 @@
;; CHECK: (func $any-convert-extern (type $71) (param $0 externref)
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.internalize
+ ;; CHECK-NEXT: (any.convert_extern
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $any-convert-extern (param externref)
local.get 0
- extern.internalize
+ any.convert_extern
drop
)
;; CHECK: (func $extern-convert-any (type $9) (param $0 anyref)
;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (extern.externalize
+ ;; CHECK-NEXT: (extern.convert_any
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $extern-convert-any (param anyref)
local.get 0
- extern.externalize
+ extern.convert_any
drop
)
diff --git a/test/spec/ref_test.wast b/test/spec/ref_test.wast
index 13bc34878..d02836106 100644
--- a/test/spec/ref_test.wast
+++ b/test/spec/ref_test.wast
@@ -19,8 +19,8 @@
(table.set $ta (i32.const 3) (ref.i31 (i32.const 7)))
(table.set $ta (i32.const 4) (struct.new_default $st))
(table.set $ta (i32.const 5) (array.new_default $at (i32.const 0)))
- (table.set $ta (i32.const 6) (extern.internalize (extern.externalize (ref.i31 (i32.const 0)))))
- (table.set $ta (i32.const 7) (extern.internalize (ref.null extern)))
+ (table.set $ta (i32.const 6) (any.convert_extern (extern.convert_any (ref.i31 (i32.const 0)))))
+ (table.set $ta (i32.const 7) (any.convert_extern (ref.null extern)))
(table.set $tf (i32.const 0) (ref.null nofunc))
(table.set $tf (i32.const 1) (ref.null func))
@@ -28,10 +28,10 @@
(table.set $te (i32.const 0) (ref.null noextern))
(table.set $te (i32.const 1) (ref.null extern))
- (table.set $te (i32.const 2) (extern.externalize (ref.i31 (i32.const 0))))
- (table.set $te (i32.const 3) (extern.externalize (ref.i31 (i32.const 8))))
- (table.set $te (i32.const 4) (extern.externalize (struct.new_default $st)))
- (table.set $te (i32.const 5) (extern.externalize (ref.null any)))
+ (table.set $te (i32.const 2) (extern.convert_any (ref.i31 (i32.const 0))))
+ (table.set $te (i32.const 3) (extern.convert_any (ref.i31 (i32.const 8))))
+ (table.set $te (i32.const 4) (extern.convert_any (struct.new_default $st)))
+ (table.set $te (i32.const 5) (extern.convert_any (ref.null any)))
)
(func (export "ref_test_null_data") (param $i i32) (result i32)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-07 13:15:49 +0000