fix test and rename error

Author: tlively

src/wasm-type.h

@@ -672,7 +672,7 @@ struct TypeBuilder {
     // A continuation reference that does not refer to a function type.
     InvalidFuncType,
     // A non-shared field of a shared heap type.
-    InvalidFieldType,
+    InvalidUnsharedField,
   };
 
   struct Error {

src/wasm/wasm-type.cpp

@@ -1697,8 +1697,8 @@ std::ostream& operator<<(std::ostream& os, TypeBuilder::ErrorReason reason) {
       return os << "Heap type has an undeclared child";
     case TypeBuilder::ErrorReason::InvalidFuncType:
       return os << "Continuation has invalid function type";
-    case TypeBuilder::ErrorReason::InvalidFieldType:
-      return os << "Heap type has an invalid field type";
+    case TypeBuilder::ErrorReason::InvalidUnsharedField:
+      return os << "Heap type has an invalid unshared field";
   }
   WASM_UNREACHABLE("Unexpected error reason");
 }
@@ -2661,14 +2661,14 @@ validateType(HeapTypeInfo& info, std::unordered_set<HeapType>& seenTypes) {
       case HeapTypeInfo::StructKind:
         for (auto& field : info.struct_.fields) {
           if (field.type.isRef() && !field.type.getHeapType().isShared()) {
-            return TypeBuilder::ErrorReason::InvalidFieldType;
+            return TypeBuilder::ErrorReason::InvalidUnsharedField;
           }
         }
         break;
       case HeapTypeInfo::ArrayKind: {
         auto elem = info.array.element.type;
         if (elem.isRef() && !elem.getHeapType().isShared()) {
-          return TypeBuilder::ErrorReason::InvalidFieldType;
+          return TypeBuilder::ErrorReason::InvalidUnsharedField;
         }
         break;
       }

test/lit/passes/type-merging-shared.wast

@@ -79,11 +79,11 @@
 (module
  ;; Shared and unshared basic heap types similarly cannot be merged.
  ;; CHECK:      (rec
- ;; CHECK-NEXT:  (type $A' (shared (struct (field anyref))))
+ ;; CHECK-NEXT:  (type $A' (struct (field anyref)))
 
- ;; CHECK:       (type $A (shared (struct (field (ref null (shared any))))))
- (type $A (shared (struct (ref null (shared any)))))
- (type $A' (shared (struct (ref null any))))
+ ;; CHECK:       (type $A (struct (field (ref null (shared any)))))
+ (type $A (struct (ref null (shared any))))
+ (type $A' (struct (ref null any)))
 
  ;; CHECK:       (type $2 (func))