Remove RTTs (#4848)

RTTs were removed from the GC spec and if they are added back in in the future,
they will be heap types rather than value types as in our implementation.
Updating our implementation to have RTTs be heap types would have been more work
than deleting them for questionable benefit since we don't know how long it will
be before they are specced again.

1 files changed, 31 insertions, 47 deletions

diff --git a/test/spec/ref_cast.wast b/test/spec/ref_cast.wast
index 8712e5954..1af96d9d4 100644
--- a/test/spec/ref_cast.wast
+++ b/test/spec/ref_cast.wast
@@ -6,15 +6,6 @@
   (type $t2' (struct (field i32) (field i32)))
   (type $t3  (struct (field i32) (field i32)))
 
-  (global $t0  (rtt $t0)  (rtt.canon $t0))
-  (global $t0' (rtt $t0)  (rtt.canon $t0))
-  (global $t1  (rtt $t1)  (rtt.sub $t1  (global.get $t0)))
-  (global $t1' (rtt $t1') (rtt.sub $t1' (global.get $t0)))
-  (global $t2  (rtt $t2)  (rtt.sub $t2  (global.get $t1)))
-  (global $t2' (rtt $t2') (rtt.sub $t2' (global.get $t1')))
-  (global $t3  (rtt $t3)  (rtt.sub $t3  (global.get $t0)))
-  (global $t4  (rtt $t3)  (rtt.sub $t3  (rtt.sub $t0 (global.get $t0))))
-
   (global $tab.0  (mut (ref null data)) (ref.null data))
   (global $tab.1  (mut (ref null data)) (ref.null data))
   (global $tab.2  (mut (ref null data)) (ref.null data))
@@ -25,62 +16,55 @@
   (global $tab.12 (mut (ref null data)) (ref.null data))
 
   (func $init
-    (global.set $tab.0  (struct.new_default_with_rtt $t0  (global.get $t0)))
-    (global.set $tab.10 (struct.new_default_with_rtt $t0  (global.get $t0')))
-    (global.set $tab.1  (struct.new_default_with_rtt $t1  (global.get $t1)))
-    (global.set $tab.11 (struct.new_default_with_rtt $t1' (global.get $t1')))
-    (global.set $tab.2  (struct.new_default_with_rtt $t2  (global.get $t2)))
-    (global.set $tab.12 (struct.new_default_with_rtt $t2' (global.get $t2')))
-    (global.set $tab.3  (struct.new_default_with_rtt $t3  (global.get $t3)))
-    (global.set $tab.4  (struct.new_default_with_rtt $t3  (global.get $t4)))
+    (global.set $tab.0  (struct.new_default $t0))
+    (global.set $tab.10 (struct.new_default $t0))
+    (global.set $tab.1  (struct.new_default $t1))
+    (global.set $tab.11 (struct.new_default $t1'))
+    (global.set $tab.2  (struct.new_default $t2))
+    (global.set $tab.12 (struct.new_default $t2'))
+    (global.set $tab.3  (struct.new_default $t3))
+    (global.set $tab.4  (struct.new_default $t3))
   )
 
   (func (export "test-sub")
     (call $init)
 
-    (drop (ref.cast (ref.null data) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.0) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.1) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.2) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.3) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.4) (global.get $t0)))
+    (drop (ref.cast_static $t0 (ref.null data)))
+    (drop (ref.cast_static $t0 (global.get $tab.0)))
+    (drop (ref.cast_static $t0 (global.get $tab.1)))
+    (drop (ref.cast_static $t0 (global.get $tab.2)))
+    (drop (ref.cast_static $t0 (global.get $tab.3)))
+    (drop (ref.cast_static $t0 (global.get $tab.4)))
 
-    (drop (ref.cast (ref.null data) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.1) (global.get $t1)))
-    (drop (ref.cast (global.get $tab.2) (global.get $t1)))
+    (drop (ref.cast_static $t0 (ref.null data)))
+    (drop (ref.cast_static $t1 (global.get $tab.1)))
+    (drop (ref.cast_static $t1 (global.get $tab.2)))
 
-    (drop (ref.cast (ref.null data) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.2) (global.get $t2)))
+    (drop (ref.cast_static $t0 (ref.null data)))
+    (drop (ref.cast_static $t2 (global.get $tab.2)))
 
-    (drop (ref.cast (ref.null data) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.3) (global.get $t3)))
+    (drop (ref.cast_static $t0 (ref.null data)))
+    (drop (ref.cast_static $t3 (global.get $tab.3)))
 
-    (drop (ref.cast (ref.null data) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.4) (global.get $t4)))
+    (drop (ref.cast_static $t0 (ref.null data)))
   )
 
   (func (export "test-canon")
     (call $init)
 
-    (drop (ref.cast (global.get $tab.0) (global.get $t0')))
-    (drop (ref.cast (global.get $tab.1) (global.get $t0')))
-    (drop (ref.cast (global.get $tab.2) (global.get $t0')))
-    (drop (ref.cast (global.get $tab.3) (global.get $t0')))
-    (drop (ref.cast (global.get $tab.4) (global.get $t0')))
-
-    (drop (ref.cast (global.get $tab.10) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.11) (global.get $t0)))
-    (drop (ref.cast (global.get $tab.12) (global.get $t0)))
+    (drop (ref.cast_static $t0 (global.get $tab.10)))
+    (drop (ref.cast_static $t0 (global.get $tab.11)))
+    (drop (ref.cast_static $t0 (global.get $tab.12)))
 
-    (drop (ref.cast (global.get $tab.1) (global.get $t1')))
-    (drop (ref.cast (global.get $tab.2) (global.get $t1')))
+    (drop (ref.cast_static $t1' (global.get $tab.1)))
+    (drop (ref.cast_static $t1' (global.get $tab.2)))
 
-    (drop (ref.cast (global.get $tab.11) (global.get $t1)))
-    (drop (ref.cast (global.get $tab.12) (global.get $t1)))
+    (drop (ref.cast_static $t1 (global.get $tab.11)))
+    (drop (ref.cast_static $t1 (global.get $tab.12)))
 
-    (drop (ref.cast (global.get $tab.2) (global.get $t2')))
+    (drop (ref.cast_static $t2' (global.get $tab.2)))
 
-    (drop (ref.cast (global.get $tab.12) (global.get $t2)))
+    (drop (ref.cast_static $t2 (global.get $tab.12)))
   )
 )