From 1079a9e34599e65ee25fb5f32caa57bd21737593 Mon Sep 17 00:00:00 2001
From: Thomas Lively <tlively@google.com>
Date: Thu, 20 Jun 2024 10:13:31 -0700
Subject: [PATCH] Re-enable spec tests requiring multivalue (#6684)

And delete tests that no longer pass now that multivalue is standard.
---
 scripts/test/shared.py |  2 --
 test/spec/func.wast    | 13 ------------
 test/spec/type.wast    | 45 +++++++++++++++++-------------------------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index b629eafc1bd..d593aa45b5a 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -406,8 +406,6 @@ def get_tests(test_dir, extensions=[], recursive=False):
     'linking.wast',
 
     # Invalid module accepted
-    'func.wast',
-    'type.wast',
     'unreached-invalid.wast',
 
     # Test invalid
diff --git a/test/spec/func.wast b/test/spec/func.wast
index a6b05f53c09..af685fb9d10 100644
--- a/test/spec/func.wast
+++ b/test/spec/func.wast
@@ -489,19 +489,6 @@
 
 ;; Invalid typing of result
 
-(assert_invalid
-  (module (func $type-multiple-result (result i32 i32) (unreachable)))
-  "invalid result arity"
-)
-(assert_invalid
-  (module
-    (type (func (result i32 i32)))
-    (func $type-multiple-result (type 0) (unreachable))
-  )
-  "invalid result arity"
-)
-
-
 (assert_invalid
   (module (func $type-empty-i32 (result i32)))
   "type mismatch"
diff --git a/test/spec/type.wast b/test/spec/type.wast
index 5ceeeb26977..b94063e6a04 100644
--- a/test/spec/type.wast
+++ b/test/spec/type.wast
@@ -11,33 +11,33 @@
   (type (func (param $x i32) (result i32)))
 
   (type (func (param f32 f64)))
-  ;; (type (func (result i64 f32)))
-  ;; (type (func (param i32 i64) (result f32 f64)))
+  (type (func (result i64 f32)))
+  (type (func (param i32 i64) (result f32 f64)))
 
   (type (func (param f32) (param f64)))
   (type (func (param $x f32) (param f64)))
   (type (func (param f32) (param $y f64)))
   (type (func (param $x f32) (param $y f64)))
-  ;; (type (func (result i64) (result f32)))
-  ;; (type (func (param i32) (param i64) (result f32) (result f64)))
-  ;; (type (func (param $x i32) (param $y i64) (result f32) (result f64)))
+  (type (func (result i64) (result f32)))
+  (type (func (param i32) (param i64) (result f32) (result f64)))
+  (type (func (param $x i32) (param $y i64) (result f32) (result f64)))
 
   (type (func (param f32 f64) (param $x i32) (param f64 i32 i32)))
-  ;; (type (func (result i64 i64 f32) (result f32 i32)))
-  ;; (type
-  ;;   (func (param i32 i32) (param i64 i32) (result f32 f64) (result f64 i32))
-  ;; )
+  (type (func (result i64 i64 f32) (result f32 i32)))
+  (type
+    (func (param i32 i32) (param i64 i32) (result f32 f64) (result f64 i32))
+  )
 
   (type (func (param) (param $x f32) (param) (param) (param f64 i32) (param)))
-  ;; (type
-  ;;   (func (result) (result) (result i64 i64) (result) (result f32) (result))
-  ;; )
-  ;; (type
-  ;;   (func
-  ;;     (param i32 i32) (param i64 i32) (param) (param $x i32) (param)
-  ;;     (result) (result f32 f64) (result f64 i32) (result)
-  ;;   )
-  ;; )
+  (type
+    (func (result) (result) (result i64 i64) (result) (result f32) (result))
+  )
+  (type
+    (func
+      (param i32 i32) (param i64 i32) (param) (param $x i32) (param)
+      (result) (result f32 f64) (result f64 i32) (result)
+    )
+  )
 )
 
 (assert_malformed
@@ -48,12 +48,3 @@
   (module quote "(type (func (result $x i32)))")
   "unexpected token"
 )
-
-(assert_invalid
-  (module (type (func (result i32 i32))))
-  "invalid result arity"
-)
-(assert_invalid
-  (module (type (func (result i32) (result i32))))
-  "invalid result arity"
-)