[Custom Descriptors] Do not optimize in AbstractTypeRefining (#7710)

AbstractTypeRefining rewrites subtype relationships, and letting it
optimize described or descriptor types while rewriting those subtypes
would be complicated. The likely path forward is to stop rewriting
subtype relationships in AbstractTypeRefining, but for now just skip
optimizing these types.

Author: tlively

scripts/test/fuzzing.py

@@ -129,6 +129,7 @@
     'optimize-instructions-desc.wast',
     'gto-desc.wast',
     'type-ssa-desc.wast',
+    'abstract-type-refining-desc.wast',
     # TODO: fix split_wast() on tricky escaping situations like a string ending
     #       in \\" (the " is not escaped - there is an escaped \ before it)
     'string-lifting-section.wast',

src/passes/AbstractTypeRefining.cpp

@@ -112,8 +112,17 @@ struct AbstractTypeRefining : public Pass {
     //       module, given closed world, but we'd also need to make sure that
     //       we don't need to make any changes to public types that refer to
     //       them.
-    for (auto type : ModuleUtils::getPublicHeapTypes(*module)) {
-      createdTypes.insert(type);
+    // Similarly, treat all descriptor and described types as allocated because
+    // we cannot yet optimize them correctly.
+    auto heapTypes = ModuleUtils::collectHeapTypeInfo(
+      *module,
+      ModuleUtils::TypeInclusion::AllTypes,
+      ModuleUtils::VisibilityHandling::FindVisibility);
+    for (auto& [type, info] : heapTypes) {
+      if (info.visibility == ModuleUtils::Visibility::Public ||
+          type.getDescribedType() || type.getDescriptorType()) {
+        createdTypes.insert(type);
+      }
     }
 
     SubTypes subTypes(*module);

test/lit/passes/abstract-type-refining-desc.wast

@@ -0,0 +1,40 @@
+;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
+
+;; RUN: foreach %s %t wasm-opt --abstract-type-refining --remove-unused-types --traps-never-happen \
+;; RUN:     -all --closed-world --preserve-type-order -S -o - | filecheck %s --check-prefix=YESTNH
+;; RUN: foreach %s %t wasm-opt --abstract-type-refining --remove-unused-types \
+;; RUN:     -all --closed-world --preserve-type-order -S -o - | filecheck %s --check-prefix=NO_TNH
+
+;; Run in both TNH and non-TNH mode.
+
+(module
+  ;; We should not try to generate invalid types by removing the subtype
+  ;; relation between $B.desc and $A.desc.
+  (rec
+    ;; YESTNH:      (rec
+    ;; YESTNH-NEXT:  (type $A (sub (descriptor $A.desc (struct))))
+    ;; NO_TNH:      (rec
+    ;; NO_TNH-NEXT:  (type $A (sub (descriptor $A.desc (struct))))
+    (type $A (sub (descriptor $A.desc (struct))))
+    ;; YESTNH:       (type $A.desc (sub (describes $A (struct))))
+    ;; NO_TNH:       (type $A.desc (sub (describes $A (struct))))
+    (type $A.desc (sub (describes $A (struct))))
+    ;; YESTNH:       (type $B (sub $A (descriptor $B.desc (struct))))
+    ;; NO_TNH:       (type $B (sub $A (descriptor $B.desc (struct))))
+    (type $B (sub $A (descriptor $B.desc (struct))))
+    ;; YESTNH:       (type $B.desc (sub $A.desc (describes $B (struct))))
+    ;; NO_TNH:       (type $B.desc (sub $A.desc (describes $B (struct))))
+    (type $B.desc (sub $A.desc (describes $B (struct))))
+  )
+  ;; YESTNH:      (global $g (ref (exact $B)) (struct.new_default $B
+  ;; YESTNH-NEXT:  (ref.null none)
+  ;; YESTNH-NEXT: ))
+  ;; NO_TNH:      (global $g (ref (exact $B)) (struct.new_default $B
+  ;; NO_TNH-NEXT:  (ref.null none)
+  ;; NO_TNH-NEXT: ))
+  (global $g (ref (exact $B))
+    (struct.new_default $B
+      (ref.null none)
+    )
+  )
+)