My changes

Author: stevenfontanella

src/parser/parsers.h

@@ -91,9 +91,10 @@ Result<> makeNop(Ctx&, Index, const std::vector<Annotation>&);
 template<typename Ctx>
 Result<> makeBinary(Ctx&, Index, const std::vector<Annotation>&, BinaryOp op);
 template<typename Ctx>
-Result<>
-makeWideIntAddSub(Ctx&, Index, const std::vector<Annotation>&, WideIntAddSubOp op);
-
+Result<> makeWideIntAddSub(Ctx&,
+                           Index,
+                           const std::vector<Annotation>&,
+                           WideIntAddSubOp op);
 template<typename Ctx>
 Result<> makeUnary(Ctx&, Index, const std::vector<Annotation>&, UnaryOp op);
 template<typename Ctx>

src/wasm/wasm-binary.cpp

@@ -4002,7 +4002,6 @@ Result<> WasmBinaryReader::readInst() {
           return builder.makeWideIntAddSub(AddInt128);
         case BinaryConsts::I64Sub128:
           return builder.makeWideIntAddSub(SubInt128);
-
         case BinaryConsts::TableSize:
           return builder.makeTableSize(getTableName(getU32LEB()));
         case BinaryConsts::TableGrow:

src/wasm/wasm-validator.cpp

@@ -937,18 +937,16 @@ void FunctionValidator::validatePoppyBlockElements(Block* curr) {
 
 void FunctionValidator::visitLoop(Loop* curr) {
   if (curr->name.is()) {
-    auto noteLabelName = [&](Name name) {
-      auto iter = breakTypes.find(name);
-      assert(iter != breakTypes.end()); // we set it ourselves
-      for (Type breakType : iter->second) {
-        shouldBeEqual(breakType,
-                      Type(Type::none),
-                      curr,
-                      "breaks to a loop cannot pass a value");
-      }
-      breakTypes.erase(iter);
-    };
     noteLabelName(curr->name);
+    auto iter = breakTypes.find(curr->name);
+    assert(iter != breakTypes.end()); // we set it ourselves
+    for (Type breakType : iter->second) {
+      shouldBeEqual(breakType,
+                    Type(Type::none),
+                    curr,
+                    "breaks to a loop cannot pass a value");
+    }
+    breakTypes.erase(iter);
   }
   if (curr->type == Type::none) {
     shouldBeFalse(curr->body->type.isConcrete(),
@@ -2450,15 +2448,17 @@ void FunctionValidator::visitWideIntAddSub(WideIntAddSub* curr) {
                     "Wide arithmetic is not enabled")) {
     return;
   }
-  for (auto* operand : {curr->leftLow, curr->leftHigh, curr->rightLow, curr->rightHigh}) {
+  for (auto* operand :
+       {curr->leftLow, curr->leftHigh, curr->rightLow, curr->rightHigh}) {
     if (operand->type != Type::unreachable) {
-      shouldBeEqual(
-        operand->type, Type(Type::i64), curr, "wide binary child types must be i64");
+      shouldBeEqual(operand->type,
+                    Type(Type::i64),
+                    curr,
+                    "wide binary child types must be i64");
     }
   }
 }
 
-
 void FunctionValidator::visitDrop(Drop* curr) {
   shouldBeTrue(curr->value->type.isConcrete() ||
                  curr->value->type == Type::unreachable,