address review comments

Author: dschuff

CMakeLists.txt

@@ -208,7 +208,7 @@ if(MSVC)
   endif()
 else()
 
-  option(ENABLE_WERROR "Enable -Werror" OFF)
+  option(ENABLE_WERROR "Enable -Werror" ON)
 
   set(THREADS_PREFER_PTHREAD_FLAG ON)
   set(CMAKE_THREAD_PREFER_PTHREAD ON)

src/ir/module-utils.h

@@ -595,8 +595,8 @@ inline void collectHeapTypes(Module& wasm,
         counts.note(child);
       }
     }
-    auto super = ht.getSuperType();
-    if (super) {
+
+    if (auto super = ht.getSuperType()) {
       if (!counts.count(*super)) {
         newTypes.insert(*super);
         // We should unconditionally count supertypes, but while the type system

src/passes/ConstantFieldPropagation.cpp

@@ -59,8 +59,7 @@ struct SubTypes {
 private:
   // Add a type to the graph.
   void note(HeapType type) {
-    auto super = type.getSuperType();
-    if (super) {
+    if (auto super = type.getSuperType()) {
       typeSubTypes[*super].insert(type);
     }
   }
@@ -463,8 +462,7 @@ struct ConstantFieldPropagation : public Pass {
         auto& infos = combinedInfos[type];
 
         // Propagate shared fields to the supertype.
-        auto superType = type.getSuperType();
-        if (superType) {
+        if (auto superType = type.getSuperType()) {
           auto& superInfos = combinedInfos[*superType];
           auto& superFields = superType->getStruct().fields;
           for (Index i = 0; i < superFields.size(); i++) {

src/passes/Print.cpp

@@ -2581,8 +2581,7 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
     } else {
       o << type;
     }
-    auto super = type.getSuperType();
-    if (super) {
+    if (auto super = type.getSuperType()) {
       o << " (extends ";
       TypeNamePrinter(o, module).print(*super);
       o << ')';

src/wasm/wasm-binary.cpp

@@ -227,7 +227,7 @@ void WasmBinaryWriter::writeTypes() {
     auto super = type.getSuperType();
     if (type.isSignature()) {
       o << S32LEB(super ? BinaryConsts::EncodedType::FuncExtending
-                           : BinaryConsts::EncodedType::Func);
+                        : BinaryConsts::EncodedType::Func);
       auto sig = type.getSignature();
       for (auto& sigType : {sig.params, sig.results}) {
         o << U32LEB(sigType.size());
@@ -237,15 +237,15 @@ void WasmBinaryWriter::writeTypes() {
       }
     } else if (type.isStruct()) {
       o << S32LEB(super ? BinaryConsts::EncodedType::StructExtending
-                           : BinaryConsts::EncodedType::Struct);
+                        : BinaryConsts::EncodedType::Struct);
       auto fields = type.getStruct().fields;
       o << U32LEB(fields.size());
       for (const auto& field : fields) {
         writeField(field);
       }
     } else if (type.isArray()) {
       o << S32LEB(super ? BinaryConsts::EncodedType::ArrayExtending
-                           : BinaryConsts::EncodedType::Array);
+                        : BinaryConsts::EncodedType::Array);
       writeField(type.getArray().element);
     } else {
       WASM_UNREACHABLE("TODO GC type writing");