[test] Cleanup i31 tests

Change-Id: I63cb4c1f7aef06240729a3879eb20ab3ef452549
Reviewed-on: https://chrome-internal-review.googlesource.com/c/v8/fuzzilli/+/8911776
Auto-Submit: Matthias Liedtke <[email protected]>
Reviewed-by: Pawel Krawczyk <[email protected]>
Commit-Queue: Matthias Liedtke <[email protected]>

Author: Liedtke

Tests/FuzzilliTests/WasmTests.swift

@@ -4817,17 +4817,18 @@ class WasmGCTests: XCTestCase {
         try refNullAbstractTypes(sharedRef: false)
     }
 
-    func testi31RefFromJs() throws {
+    func i31Ref(shared: Bool) throws {
         let runner = try GetJavaScriptExecutorOrSkipTest(type: .any, withArguments: ["--experimental-wasm-shared"])
         let liveTestConfig = Configuration(logLevel: .error, enableInspection: true)
         let fuzzer = makeMockFuzzer(config: liveTestConfig, environment: JavaScriptEnvironment())
         let b = fuzzer.makeBuilder()
+        let i31RefT = ILType.wasmI31Ref(shared: shared)
 
         let module = b.buildWasmModule { wasmModule in
-            wasmModule.addWasmFunction(with: [.wasmi32] => [.wasmI31Ref()]) { function, label, args in
-                [function.wasmRefI31(args[0])]
+            wasmModule.addWasmFunction(with: [.wasmi32] => [i31RefT]) { function, label, args in
+                [function.wasmRefI31(args[0], shared: shared)]
             }
-            wasmModule.addWasmFunction(with: [.wasmI31Ref()] => [.wasmi32, .wasmi32]) { function, label, args in
+            wasmModule.addWasmFunction(with: [i31RefT] => [.wasmi32, .wasmi32]) { function, label, args in
                 [function.wasmI31Get(args[0], isSigned: true),
                  function.wasmI31Get(args[0], isSigned: false)]
             }
@@ -4851,39 +4852,6 @@ class WasmGCTests: XCTestCase {
         testForOutput(program: jsProg, runner: runner, outputString: "42\n-42\n42,42\n-42,2147483606\n")
     }
 
-    func i31Ref(shared: Bool) throws {
-        let runner = try GetJavaScriptExecutorOrSkipTest(type: .any, withArguments:  shared ? ["--experimental-wasm-shared", "--experimental-wasm-stringref"] : [])
-        let liveTestConfig = Configuration(logLevel: .error, enableInspection: true)
-        let fuzzer = makeMockFuzzer(config: liveTestConfig, environment: JavaScriptEnvironment())
-        let b: ProgramBuilder = fuzzer.makeBuilder()
-        let i31RefType = ILType.wasmI31Ref(shared: shared)
-
-        let module = b.buildWasmModule { wasmModule in
-            let createReferenceOf = wasmModule.addWasmFunction(with: [.wasmi32] => [i31RefType]) { function, label, args in
-                [function.wasmRefI31(args[0], shared: shared)]
-            }
-            let dereference = wasmModule.addWasmFunction(with: [i31RefType] => [.wasmi32, .wasmi32]) { function, label, args in
-                [function.wasmI31Get(args[0], isSigned: true),
-                 function.wasmI31Get(args[0], isSigned: false)]
-            }
-            wasmModule.addWasmFunction(with: [] => [.wasmi32, .wasmi32]) { function, label, args in
-                let const = function.consti32(-42)
-                let constRef = function.wasmCallDirect(signature: [.wasmi32] => [i31RefType], function: createReferenceOf, functionArgs: [const])
-                let dereferencedConst = function.wasmCallDirect(signature: [i31RefType] => [.wasmi32, .wasmi32], function: dereference, functionArgs: constRef)
-                return dereferencedConst
-            }
-        }
-
-        let exports = module.loadExports()
-        let outputFunc = b.createNamedVariable(forBuiltin: "output")
-        let result = b.callMethod(module.getExportedMethod(at: 2), on: exports, withArgs: [b.loadInt(42)])
-        b.callFunction(outputFunc, withArgs: [result])
-
-        let prog = b.finalize()
-        let jsProg = fuzzer.lifter.lift(prog)
-        testForOutput(program: jsProg, runner: runner, outputString: "-42,2147483606\n")
-    }
-
     func testi31RefShared() throws {
         try i31Ref(shared: true)
     }