From cd94f8af963ea8233fc15db35ff8d9e70aff22cf Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Mon, 18 Sep 2023 10:45:36 -0700 Subject: Remove legacy type defintion text syntax (#5948) Remove support for the "struct_subtype", "array_subtype", "func_subtype", and "extends" notations we used at various times to declare WasmGC types, leaving only support for the standard text fromat for declaring types. Update all the tests using the old formats and delete tests that existed solely to test the old formats. --- test/gtest/possible-contents.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/gtest/possible-contents.cpp') diff --git a/test/gtest/possible-contents.cpp b/test/gtest/possible-contents.cpp index 1838ad3ab..6599407fa 100644 --- a/test/gtest/possible-contents.cpp +++ b/test/gtest/possible-contents.cpp @@ -895,10 +895,10 @@ TEST_F(PossibleContentsTest, TestOracleManyTypes) { // we'll just report that more than one is possible, a cone of data. auto wasm = parse(R"( (module - (type $A (struct_subtype (field i32) data)) - (type $B (struct_subtype (field i64) data)) - (type $C (struct_subtype (field f32) data)) - (type $D (struct_subtype (field f64) data)) + (type $A (sub (struct (field i32)))) + (type $B (sub (struct (field i64)))) + (type $C (sub (struct (field f32)))) + (type $D (sub (struct (field f64)))) (func $foo (result (ref any)) (select (result (ref any)) (select (result (ref any)) @@ -930,9 +930,9 @@ TEST_F(PossibleContentsTest, TestOracleNoFullCones) { // infinity). auto wasm = parse(R"( (module - (type $A (struct_subtype (field i32) data)) - (type $B (struct_subtype (field i32) $A)) - (type $C (struct_subtype (field i32) $B)) + (type $A (sub (struct (field i32)))) + (type $B (sub $A (struct (field i32)))) + (type $C (sub $B (struct (field i32)))) (func $foo (export "foo") ;; Note we must declare $C so that $B and $C have uses and are not ;; removed automatically from consideration. -- cgit v1.2.3