More test updates

vouillon · vouillon · commit 7e56d353edc2 · 2025-02-26T19:57:05.000+01:00
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
@@ -3963,6 +3963,12 @@ static void validateExports(Module& module, ValidationInfo& info) {
                       exp->name,
                       "Exported type requires type-imports "
                       "[--enable-type-imports]");
+    auto feats = exp->heaptype.getFeatures();
+    if (!info.shouldBeTrue(feats <= module.features,
+                           exp->name,
+                           "Export type requires additional features")) {
+      info.getStream(nullptr) << getMissingFeaturesList(module, feats) << '\n';
+    }
     Name exportName = exp->name;
     info.shouldBeFalse(exportNames.count(exportName) > 0,
                        exportName,
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
@@ -33,7 +33,7 @@ Features.RelaxedSIMD: 4096
 Features.ExtendedConst: 8192
 Features.Strings: 16384
 Features.MultiMemory: 32768
-Features.All: 2097151
+Features.All: 4194303
 InvalidId: 0
 BlockId: 1
 IfId: 2
diff --git a/test/lit/help/wasm-as.test b/test/lit/help/wasm-as.test
@@ -128,6 +128,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm-ctor-eval.test b/test/lit/help/wasm-ctor-eval.test
@@ -135,6 +135,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm-dis.test b/test/lit/help/wasm-dis.test
@@ -121,6 +121,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm-emscripten-finalize.test b/test/lit/help/wasm-emscripten-finalize.test
@@ -163,6 +163,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm-merge.test b/test/lit/help/wasm-merge.test
@@ -153,6 +153,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm-metadce.test b/test/lit/help/wasm-metadce.test
@@ -777,6 +777,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                                Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                         Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports                        Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references            Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references           Deprecated compatibility flag
diff --git a/test/lit/help/wasm-opt.test b/test/lit/help/wasm-opt.test
@@ -789,6 +789,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                                Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                         Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports                        Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references            Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references           Deprecated compatibility flag
diff --git a/test/lit/help/wasm-reduce.test b/test/lit/help/wasm-reduce.test
@@ -160,6 +160,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm-split.test b/test/lit/help/wasm-split.test
@@ -260,6 +260,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                       Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports               Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references   Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references  Deprecated compatibility flag
diff --git a/test/lit/help/wasm2js.test b/test/lit/help/wasm2js.test
@@ -740,6 +740,10 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-fp16                                Disable float 16 operations
 ;; CHECK-NEXT:
+;; CHECK-NEXT:   --enable-type-imports                         Enable type imports
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --disable-type-imports                        Disable type imports
+;; CHECK-NEXT:
 ;; CHECK-NEXT:   --enable-typed-function-references            Deprecated compatibility flag
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --disable-typed-function-references           Deprecated compatibility flag
diff --git a/test/unit/test_features.py b/test/unit/test_features.py
@@ -60,6 +60,10 @@ def check_stack_switching(self, module, error):
         self.check_feature(module, error, '--enable-stack-switching',
                            ['--enable-gc', '--enable-reference-types', '--enable-exception-handling'])
 
+    def check_type_imports(self, module, error):
+        self.check_feature(module, error, '--enable-type-imports',
+                           ['--enable-reference-types'])
+
     def test_v128_signature(self):
         module = '''
         (module
@@ -329,6 +333,23 @@ def check_nop(flag):
         check_nop('--enable-call-indirect-overlong')
         check_nop('--disable-call-indirect-overlong')
 
+    def test_type_imports_export(self):
+        module = '''
+        (module
+         (export "foo" (type extern))
+        )
+        '''
+        self.check_type_imports(module, 'Exported type requires type-imports')
+
+    def test_type_imports_import(self):
+        module = '''
+        (module
+         (import "env" "foo" (type $foo (sub extern)))
+         (func $f (param (ref $foo)))
+        )
+        '''
+        self.check_type_imports(module, 'all used types should be allowed')
+
 
 class TargetFeaturesSectionTest(utils.BinaryenTestCase):
     def test_atomics(self):
@@ -451,4 +472,5 @@ def test_emit_all_features(self):
             '--enable-shared-everything',
             '--enable-fp16',
             '--enable-bulk-memory-opt',
+            '--enable-type-imports',
         ], p2.stdout.splitlines())
