6 files changed, 22 insertions, 59 deletions
diff --git a/test/spec/call_indirect_sig_mismatch.wast b/test/spec/call_indirect_sig_mismatch.wast
index 15e5d6a5a..69cca17ba 100644
--- a/test/spec/call_indirect_sig_mismatch.wast
+++ b/test/spec/call_indirect_sig_mismatch.wast
@@ -5,7 +5,7 @@
   (func $callee (param $0 exnref))
   (func $sig_mismatch
     (call_indirect (type $funcref_=>_none)
-      (ref.null)
+      (ref.null func)
       (i32.const 0)
     )
   )
diff --git a/test/spec/exception-handling.wast b/test/spec/exception-handling.wast
index c3b80896e..0188865ac 100644
--- a/test/spec/exception-handling.wast
+++ b/test/spec/exception-handling.wast
@@ -11,8 +11,8 @@
     (throw $e-i32-f32 (i32.const 3) (f32.const 3.5))
   )
 
-  (func (export "rethrow_nullref")
-    (rethrow (ref.null))
+  (func (export "rethrow_null")
+    (rethrow (ref.null exn))
   )
 
   (func (export "try_nothrow") (result i32)
@@ -74,10 +74,10 @@
     )
   )
 
-  (func (export "br_on_exn_nullref") (result i32)
+  (func (export "br_on_exn_null") (result i32)
     (block $l0 (result i32)
       (drop
-        (br_on_exn $l0 $e-i32 (ref.null))
+        (br_on_exn $l0 $e-i32 (ref.null exn))
       )
       (i32.const 0)
     )
@@ -185,13 +185,13 @@
 
 (assert_trap (invoke "throw_single_value"))
 (assert_trap (invoke "throw_multiple_values"))
-(assert_trap (invoke "rethrow_nullref"))
+(assert_trap (invoke "rethrow_null"))
 (assert_return (invoke "try_nothrow") (i32.const 3))
 (assert_return (invoke "try_throw_catch") (i32.const 3))
 (assert_return (invoke "try_call_catch") (i32.const 3))
 (assert_trap (invoke "try_throw_rethrow"))
 (assert_trap (invoke "try_call_rethrow"))
-(assert_trap (invoke "br_on_exn_nullref"))
+(assert_trap (invoke "br_on_exn_null"))
 (assert_return (invoke "br_on_exn_match_no_value"))
 (assert_return (invoke "br_on_exn_match_single_value") (i32.const 5))
 (assert_return (invoke "br_on_exn_match_multiple_values") (tuple.make (i32.const 3) (f32.const 3.5)))
diff --git a/test/spec/old_select.wast b/test/spec/old_select.wast
index e1dd40654..5228017b0 100644
--- a/test/spec/old_select.wast
+++ b/test/spec/old_select.wast
@@ -23,9 +23,6 @@
     (select (result f64) (local.get 0) (local.get 1) (local.get 2))
   )
 
-  (func (export "select-nullref") (param nullref nullref i32) (result nullref)
-    (select (result nullref) (local.get 0) (local.get 1) (local.get 2))
-  )
   (func (export "select-funcref") (param funcref funcref i32) (result funcref)
     (select (result funcref) (local.get 0) (local.get 1) (local.get 2))
   )
@@ -38,24 +35,6 @@
    (select (unreachable) (i32.const 0) (local.get $cond)))
   (func (export "select_trap_r") (param $cond i32) (result i32)
    (select (i32.const 0) (unreachable) (local.get $cond)))
-
-  (func (export "join-nullref") (param i32) (result externref)
-    (select (result externref) (ref.null) (ref.null) (local.get 0))
-  )
-  (func (export "join-funcref") (param i32) (result externref)
-    (select (result externref)
-      (ref.func $dummy)
-      (ref.null)
-      (local.get 0)
-    )
-  )
-  (func (export "join-externref") (param i32) (param externref) (result externref)
-    (select (result externref)
-      (ref.func $dummy)
-      (local.get 1)
-      (local.get 0)
-    )
-  )
 )
 
 (assert_return (invoke "select_i32" (i32.const 1) (i32.const 2) (i32.const 1)) (i32.const 1))
@@ -90,15 +69,11 @@
 (assert_return (invoke "select-i64-t" (i64.const 2) (i64.const 1) (i32.const 1)) (i64.const 2))
 (assert_return (invoke "select-f32-t" (f32.const 1) (f32.const 2) (i32.const 1)) (f32.const 1))
 (assert_return (invoke "select-f64-t" (f64.const 1) (f64.const 2) (i32.const 1)) (f64.const 1))
-(assert_return (invoke "select-nullref" (ref.null) (ref.null) (i32.const 1)) (ref.null))
-(assert_return (invoke "select-funcref" (ref.func "dummy") (ref.null) (i32.const 1)) (ref.func "dummy"))
-(assert_return (invoke "select-externref" (ref.null) (ref.func "dummy") (i32.const 1)) (ref.null))
 
 (assert_return (invoke "select-i32-t" (i32.const 1) (i32.const 2) (i32.const 0)) (i32.const 2))
 (assert_return (invoke "select-i32-t" (i32.const 2) (i32.const 1) (i32.const 0)) (i32.const 1))
 (assert_return (invoke "select-i64-t" (i64.const 2) (i64.const 1) (i32.const -1)) (i64.const 2))
 (assert_return (invoke "select-i64-t" (i64.const 2) (i64.const 1) (i32.const 0xf0f0f0f0)) (i64.const 2))
-(assert_return (invoke "select-externref" (ref.null) (ref.func "dummy") (i32.const 0)) (ref.func "dummy"))
 
 (assert_return (invoke "select-f32-t" (f32.const nan) (f32.const 1) (i32.const 1)) (f32.const nan))
 (assert_return (invoke "select-f32-t" (f32.const nan:0x20304) (f32.const 1) (i32.const 1)) (f32.const nan:0x20304))
@@ -118,14 +93,10 @@
 (assert_return (invoke "select-f64-t" (f64.const 2) (f64.const nan) (i32.const 0)) (f64.const nan))
 (assert_return (invoke "select-f64-t" (f64.const 2) (f64.const nan:0x20304) (i32.const 0)) (f64.const nan:0x20304))
 
-(assert_return (invoke "join-nullref" (i32.const 1)) (ref.null))
-(assert_return (invoke "join-nullref" (i32.const 0)) (ref.null))
-
-(assert_return_func (invoke "join-funcref" (i32.const 1)))
-(assert_return (invoke "join-funcref" (i32.const 0)) (ref.null))
-
-(assert_return_func (invoke "join-externref" (i32.const 1) (ref.null)))
-(assert_return (invoke "join-externref" (i32.const 0) (ref.null)) (ref.null))
+(assert_return (invoke "select-funcref" (ref.func "dummy") (ref.null func) (i32.const 1)) (ref.func "dummy"))
+(assert_return (invoke "select-funcref" (ref.func "dummy") (ref.null func) (i32.const 0)) (ref.null func))
+(assert_return (invoke "select-externref" (ref.null extern) (ref.null extern) (i32.const 1)) (ref.null extern))
+(assert_return (invoke "select-externref" (ref.null extern) (ref.null extern) (i32.const 0)) (ref.null extern))
 
 (assert_trap (invoke "select_trap_l" (i32.const 1)) "unreachable executed")
 (assert_trap (invoke "select_trap_l" (i32.const 0)) "unreachable executed")
diff --git a/test/spec/ref_func.wast b/test/spec/ref_func.wast
index 79bf584be..f68e6166d 100644
--- a/test/spec/ref_func.wast
+++ b/test/spec/ref_func.wast
@@ -5,8 +5,7 @@
   (func $f (import "M" "f") (param i32) (result i32))
   (func $g (param $x i32) (result i32) (i32.add (local.get $x) (i32.const 1)))
 
-  (global externref (ref.func $f))
-  (global externref (ref.func $g))
+  (global externref (ref.null extern))
   (global funcref (ref.func $f))
   (global funcref (ref.func $g))
   (global $v (mut funcref) (ref.func $f))
diff --git a/test/spec/ref_is_null.wast b/test/spec/ref_is_null.wast
index e44fcf496..8f820d2bc 100644
--- a/test/spec/ref_is_null.wast
+++ b/test/spec/ref_is_null.wast
@@ -1,15 +1,11 @@
 (module
-  (func $f1 (export "nullref") (param $x nullref) (result i32)
+  (func $f1 (export "externref") (param $x externref) (result i32)
     (ref.is_null (local.get $x))
   )
-  (func $f2 (export "externref") (param $x externref) (result i32)
-    (ref.is_null (local.get $x))
-  )
-  (func $f3 (export "funcref") (param $x funcref) (result i32)
+  (func $f2 (export "funcref") (param $x funcref) (result i32)
     (ref.is_null (local.get $x))
   )
 )
 
-(assert_return (invoke "nullref" (ref.null)) (i32.const 1))
-(assert_return (invoke "externref" (ref.null)) (i32.const 1))
-(assert_return (invoke "funcref" (ref.null)) (i32.const 1))
+(assert_return (invoke "externref" (ref.null extern)) (i32.const 1))
+(assert_return (invoke "funcref" (ref.null func)) (i32.const 1))
diff --git a/test/spec/ref_null.wast b/test/spec/ref_null.wast
index 93e6acbd2..b88b0888f 100644
--- a/test/spec/ref_null.wast
+++ b/test/spec/ref_null.wast
@@ -1,13 +1,10 @@
 (module
-  (func (export "externref") (result externref) (ref.null))
-  (func (export "funcref") (result funcref) (ref.null))
-  (func (export "nullref") (result nullref) (ref.null))
+  (func (export "externref") (result externref) (ref.null extern))
+  (func (export "funcref") (result funcref) (ref.null func))
 
-  (global externref (ref.null))
-  (global funcref (ref.null))
-  (global nullref (ref.null))
+  (global externref (ref.null extern))
+  (global funcref (ref.null func))
 )
 
-(assert_return (invoke "externref") (ref.null))
-(assert_return (invoke "funcref") (ref.null))
-(assert_return (invoke "nullref") (ref.null))
+(assert_return (invoke "externref") (ref.null extern))
+(assert_return (invoke "funcref") (ref.null func))