Minor code cleanups (#1617)

* code cleanups in wasm-binary: remove an & param, and standardize whitespace

* add some docs for how the relooper handles blocks with no outgoing branches [ci skip]

1 files changed, 123 insertions, 123 deletions

diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index 3602a70e7..a11a66227 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -615,7 +615,7 @@ void WasmBinaryWriter::finishUp() {
   }
 }
 
-void WasmBinaryWriter::recurse(Expression*& curr) {
+void WasmBinaryWriter::recurse(Expression* curr) {
   if (debug) std::cerr << "zz recurse into " << ++depth << " at " << o.size() << std::endl;
   visit(curr);
   if (debug) std::cerr << "zz recurse from " << depth-- << " at " << o.size() << std::endl;
@@ -1111,39 +1111,39 @@ void WasmBinaryWriter::visitUnary(Unary *curr) {
   if (debug) std::cerr << "zz node: Unary" << std::endl;
   recurse(curr->value);
   switch (curr->op) {
-    case ClzInt32:         o << int8_t(BinaryConsts::I32Clz); break;
-    case CtzInt32:         o << int8_t(BinaryConsts::I32Ctz); break;
-    case PopcntInt32:      o << int8_t(BinaryConsts::I32Popcnt); break;
-    case EqZInt32:         o << int8_t(BinaryConsts::I32EqZ); break;
-    case ClzInt64:         o << int8_t(BinaryConsts::I64Clz); break;
-    case CtzInt64:         o << int8_t(BinaryConsts::I64Ctz); break;
-    case PopcntInt64:      o << int8_t(BinaryConsts::I64Popcnt); break;
-    case EqZInt64:         o << int8_t(BinaryConsts::I64EqZ); break;
-    case NegFloat32:       o << int8_t(BinaryConsts::F32Neg); break;
-    case AbsFloat32:       o << int8_t(BinaryConsts::F32Abs); break;
-    case CeilFloat32:      o << int8_t(BinaryConsts::F32Ceil); break;
-    case FloorFloat32:     o << int8_t(BinaryConsts::F32Floor); break;
-    case TruncFloat32:     o << int8_t(BinaryConsts::F32Trunc); break;
-    case NearestFloat32:   o << int8_t(BinaryConsts::F32NearestInt); break;
-    case SqrtFloat32:      o << int8_t(BinaryConsts::F32Sqrt); break;
-    case NegFloat64:       o << int8_t(BinaryConsts::F64Neg); break;
-    case AbsFloat64:       o << int8_t(BinaryConsts::F64Abs); break;
-    case CeilFloat64:      o << int8_t(BinaryConsts::F64Ceil); break;
-    case FloorFloat64:     o << int8_t(BinaryConsts::F64Floor); break;
-    case TruncFloat64:     o << int8_t(BinaryConsts::F64Trunc); break;
-    case NearestFloat64:   o << int8_t(BinaryConsts::F64NearestInt); break;
-    case SqrtFloat64:      o << int8_t(BinaryConsts::F64Sqrt); break;
-    case ExtendSInt32:     o << int8_t(BinaryConsts::I64STruncI32); break;
-    case ExtendUInt32:     o << int8_t(BinaryConsts::I64UTruncI32); break;
-    case WrapInt64:        o << int8_t(BinaryConsts::I32ConvertI64); break;
-    case TruncUFloat32ToInt32: o << int8_t(BinaryConsts::I32UTruncF32); break;
-    case TruncUFloat32ToInt64: o << int8_t(BinaryConsts::I64UTruncF32); break;
-    case TruncSFloat32ToInt32: o << int8_t(BinaryConsts::I32STruncF32); break;
-    case TruncSFloat32ToInt64: o << int8_t(BinaryConsts::I64STruncF32); break;
-    case TruncUFloat64ToInt32: o << int8_t(BinaryConsts::I32UTruncF64); break;
-    case TruncUFloat64ToInt64: o << int8_t(BinaryConsts::I64UTruncF64); break;
-    case TruncSFloat64ToInt32: o << int8_t(BinaryConsts::I32STruncF64); break;
-    case TruncSFloat64ToInt64: o << int8_t(BinaryConsts::I64STruncF64); break;
+    case ClzInt32:               o << int8_t(BinaryConsts::I32Clz); break;
+    case CtzInt32:               o << int8_t(BinaryConsts::I32Ctz); break;
+    case PopcntInt32:            o << int8_t(BinaryConsts::I32Popcnt); break;
+    case EqZInt32:               o << int8_t(BinaryConsts::I32EqZ); break;
+    case ClzInt64:               o << int8_t(BinaryConsts::I64Clz); break;
+    case CtzInt64:               o << int8_t(BinaryConsts::I64Ctz); break;
+    case PopcntInt64:            o << int8_t(BinaryConsts::I64Popcnt); break;
+    case EqZInt64:               o << int8_t(BinaryConsts::I64EqZ); break;
+    case NegFloat32:             o << int8_t(BinaryConsts::F32Neg); break;
+    case AbsFloat32:             o << int8_t(BinaryConsts::F32Abs); break;
+    case CeilFloat32:            o << int8_t(BinaryConsts::F32Ceil); break;
+    case FloorFloat32:           o << int8_t(BinaryConsts::F32Floor); break;
+    case TruncFloat32:           o << int8_t(BinaryConsts::F32Trunc); break;
+    case NearestFloat32:         o << int8_t(BinaryConsts::F32NearestInt); break;
+    case SqrtFloat32:            o << int8_t(BinaryConsts::F32Sqrt); break;
+    case NegFloat64:             o << int8_t(BinaryConsts::F64Neg); break;
+    case AbsFloat64:             o << int8_t(BinaryConsts::F64Abs); break;
+    case CeilFloat64:            o << int8_t(BinaryConsts::F64Ceil); break;
+    case FloorFloat64:           o << int8_t(BinaryConsts::F64Floor); break;
+    case TruncFloat64:           o << int8_t(BinaryConsts::F64Trunc); break;
+    case NearestFloat64:         o << int8_t(BinaryConsts::F64NearestInt); break;
+    case SqrtFloat64:            o << int8_t(BinaryConsts::F64Sqrt); break;
+    case ExtendSInt32:           o << int8_t(BinaryConsts::I64STruncI32); break;
+    case ExtendUInt32:           o << int8_t(BinaryConsts::I64UTruncI32); break;
+    case WrapInt64:              o << int8_t(BinaryConsts::I32ConvertI64); break;
+    case TruncUFloat32ToInt32:   o << int8_t(BinaryConsts::I32UTruncF32); break;
+    case TruncUFloat32ToInt64:   o << int8_t(BinaryConsts::I64UTruncF32); break;
+    case TruncSFloat32ToInt32:   o << int8_t(BinaryConsts::I32STruncF32); break;
+    case TruncSFloat32ToInt64:   o << int8_t(BinaryConsts::I64STruncF32); break;
+    case TruncUFloat64ToInt32:   o << int8_t(BinaryConsts::I32UTruncF64); break;
+    case TruncUFloat64ToInt64:   o << int8_t(BinaryConsts::I64UTruncF64); break;
+    case TruncSFloat64ToInt32:   o << int8_t(BinaryConsts::I32STruncF64); break;
+    case TruncSFloat64ToInt64:   o << int8_t(BinaryConsts::I64STruncF64); break;
     case ConvertUInt32ToFloat32: o << int8_t(BinaryConsts::F32UConvertI32); break;
     case ConvertUInt32ToFloat64: o << int8_t(BinaryConsts::F64UConvertI32); break;
     case ConvertSInt32ToFloat32: o << int8_t(BinaryConsts::F32SConvertI32); break;
@@ -1152,17 +1152,17 @@ void WasmBinaryWriter::visitUnary(Unary *curr) {
     case ConvertUInt64ToFloat64: o << int8_t(BinaryConsts::F64UConvertI64); break;
     case ConvertSInt64ToFloat32: o << int8_t(BinaryConsts::F32SConvertI64); break;
     case ConvertSInt64ToFloat64: o << int8_t(BinaryConsts::F64SConvertI64); break;
-    case DemoteFloat64:    o << int8_t(BinaryConsts::F32ConvertF64); break;
-    case PromoteFloat32:   o << int8_t(BinaryConsts::F64ConvertF32); break;
-    case ReinterpretFloat32: o << int8_t(BinaryConsts::I32ReinterpretF32); break;
-    case ReinterpretFloat64: o << int8_t(BinaryConsts::I64ReinterpretF64); break;
-    case ReinterpretInt32: o << int8_t(BinaryConsts::F32ReinterpretI32); break;
-    case ReinterpretInt64: o << int8_t(BinaryConsts::F64ReinterpretI64); break;
-    case ExtendS8Int32: o << int8_t(BinaryConsts::I32ExtendS8); break;
-    case ExtendS16Int32: o << int8_t(BinaryConsts::I32ExtendS16); break;
-    case ExtendS8Int64: o << int8_t(BinaryConsts::I64ExtendS8); break;
-    case ExtendS16Int64: o << int8_t(BinaryConsts::I64ExtendS16); break;
-    case ExtendS32Int64: o << int8_t(BinaryConsts::I64ExtendS32); break;
+    case DemoteFloat64:          o << int8_t(BinaryConsts::F32ConvertF64); break;
+    case PromoteFloat32:         o << int8_t(BinaryConsts::F64ConvertF32); break;
+    case ReinterpretFloat32:     o << int8_t(BinaryConsts::I32ReinterpretF32); break;
+    case ReinterpretFloat64:     o << int8_t(BinaryConsts::I64ReinterpretF64); break;
+    case ReinterpretInt32:       o << int8_t(BinaryConsts::F32ReinterpretI32); break;
+    case ReinterpretInt64:       o << int8_t(BinaryConsts::F64ReinterpretI64); break;
+    case ExtendS8Int32:          o << int8_t(BinaryConsts::I32ExtendS8); break;
+    case ExtendS16Int32:         o << int8_t(BinaryConsts::I32ExtendS16); break;
+    case ExtendS8Int64:          o << int8_t(BinaryConsts::I64ExtendS8); break;
+    case ExtendS16Int64:         o << int8_t(BinaryConsts::I64ExtendS16); break;
+    case ExtendS32Int64:         o << int8_t(BinaryConsts::I64ExtendS32); break;
     default: abort();
   }
   if (curr->type == unreachable) {
@@ -1176,85 +1176,85 @@ void WasmBinaryWriter::visitBinary(Binary *curr) {
   recurse(curr->right);
 
   switch (curr->op) {
-    case AddInt32:      o << int8_t(BinaryConsts::I32Add);     break;
-    case SubInt32:      o << int8_t(BinaryConsts::I32Sub);     break;
-    case MulInt32:      o << int8_t(BinaryConsts::I32Mul);     break;
-    case DivSInt32:     o << int8_t(BinaryConsts::I32DivS);   break;
-    case DivUInt32:     o << int8_t(BinaryConsts::I32DivU);   break;
-    case RemSInt32:     o << int8_t(BinaryConsts::I32RemS);   break;
-    case RemUInt32:     o << int8_t(BinaryConsts::I32RemU);   break;
-    case AndInt32:      o << int8_t(BinaryConsts::I32And);     break;
-    case OrInt32:       o << int8_t(BinaryConsts::I32Or);      break;
-    case XorInt32:      o << int8_t(BinaryConsts::I32Xor);     break;
-    case ShlInt32:      o << int8_t(BinaryConsts::I32Shl);     break;
-    case ShrUInt32:     o << int8_t(BinaryConsts::I32ShrU);   break;
-    case ShrSInt32:     o << int8_t(BinaryConsts::I32ShrS);   break;
-    case RotLInt32:     o << int8_t(BinaryConsts::I32RotL);    break;
-    case RotRInt32:     o << int8_t(BinaryConsts::I32RotR);    break;
-    case EqInt32:       o << int8_t(BinaryConsts::I32Eq);      break;
-    case NeInt32:       o << int8_t(BinaryConsts::I32Ne);      break;
-    case LtSInt32:      o << int8_t(BinaryConsts::I32LtS);    break;
-    case LtUInt32:      o << int8_t(BinaryConsts::I32LtU);    break;
-    case LeSInt32:      o << int8_t(BinaryConsts::I32LeS);    break;
-    case LeUInt32:      o << int8_t(BinaryConsts::I32LeU);    break;
-    case GtSInt32:      o << int8_t(BinaryConsts::I32GtS);    break;
-    case GtUInt32:      o << int8_t(BinaryConsts::I32GtU);    break;
-    case GeSInt32:      o << int8_t(BinaryConsts::I32GeS);    break;
-    case GeUInt32:      o << int8_t(BinaryConsts::I32GeU);    break;
-
-    case AddInt64:      o << int8_t(BinaryConsts::I64Add);     break;
-    case SubInt64:      o << int8_t(BinaryConsts::I64Sub);     break;
-    case MulInt64:      o << int8_t(BinaryConsts::I64Mul);     break;
-    case DivSInt64:     o << int8_t(BinaryConsts::I64DivS);   break;
-    case DivUInt64:     o << int8_t(BinaryConsts::I64DivU);   break;
-    case RemSInt64:     o << int8_t(BinaryConsts::I64RemS);   break;
-    case RemUInt64:     o << int8_t(BinaryConsts::I64RemU);   break;
-    case AndInt64:      o << int8_t(BinaryConsts::I64And);     break;
-    case OrInt64:       o << int8_t(BinaryConsts::I64Or);      break;
-    case XorInt64:      o << int8_t(BinaryConsts::I64Xor);     break;
-    case ShlInt64:      o << int8_t(BinaryConsts::I64Shl);     break;
-    case ShrUInt64:     o << int8_t(BinaryConsts::I64ShrU);   break;
-    case ShrSInt64:     o << int8_t(BinaryConsts::I64ShrS);   break;
-    case RotLInt64:     o << int8_t(BinaryConsts::I64RotL);    break;
-    case RotRInt64:     o << int8_t(BinaryConsts::I64RotR);    break;
-    case EqInt64:       o << int8_t(BinaryConsts::I64Eq);      break;
-    case NeInt64:       o << int8_t(BinaryConsts::I64Ne);      break;
-    case LtSInt64:      o << int8_t(BinaryConsts::I64LtS);    break;
-    case LtUInt64:      o << int8_t(BinaryConsts::I64LtU);    break;
-    case LeSInt64:      o << int8_t(BinaryConsts::I64LeS);    break;
-    case LeUInt64:      o << int8_t(BinaryConsts::I64LeU);    break;
-    case GtSInt64:      o << int8_t(BinaryConsts::I64GtS);    break;
-    case GtUInt64:      o << int8_t(BinaryConsts::I64GtU);    break;
-    case GeSInt64:      o << int8_t(BinaryConsts::I64GeS);    break;
-    case GeUInt64:      o << int8_t(BinaryConsts::I64GeU);    break;
-
-    case AddFloat32:      o << int8_t(BinaryConsts::F32Add);     break;
-    case SubFloat32:      o << int8_t(BinaryConsts::F32Sub);     break;
-    case MulFloat32:      o << int8_t(BinaryConsts::F32Mul);     break;
-    case DivFloat32:      o << int8_t(BinaryConsts::F32Div);     break;
+    case AddInt32:      o << int8_t(BinaryConsts::I32Add); break;
+    case SubInt32:      o << int8_t(BinaryConsts::I32Sub); break;
+    case MulInt32:      o << int8_t(BinaryConsts::I32Mul); break;
+    case DivSInt32:     o << int8_t(BinaryConsts::I32DivS); break;
+    case DivUInt32:     o << int8_t(BinaryConsts::I32DivU); break;
+    case RemSInt32:     o << int8_t(BinaryConsts::I32RemS); break;
+    case RemUInt32:     o << int8_t(BinaryConsts::I32RemU); break;
+    case AndInt32:      o << int8_t(BinaryConsts::I32And); break;
+    case OrInt32:       o << int8_t(BinaryConsts::I32Or); break;
+    case XorInt32:      o << int8_t(BinaryConsts::I32Xor); break;
+    case ShlInt32:      o << int8_t(BinaryConsts::I32Shl); break;
+    case ShrUInt32:     o << int8_t(BinaryConsts::I32ShrU); break;
+    case ShrSInt32:     o << int8_t(BinaryConsts::I32ShrS); break;
+    case RotLInt32:     o << int8_t(BinaryConsts::I32RotL); break;
+    case RotRInt32:     o << int8_t(BinaryConsts::I32RotR); break;
+    case EqInt32:       o << int8_t(BinaryConsts::I32Eq); break;
+    case NeInt32:       o << int8_t(BinaryConsts::I32Ne); break;
+    case LtSInt32:      o << int8_t(BinaryConsts::I32LtS); break;
+    case LtUInt32:      o << int8_t(BinaryConsts::I32LtU); break;
+    case LeSInt32:      o << int8_t(BinaryConsts::I32LeS); break;
+    case LeUInt32:      o << int8_t(BinaryConsts::I32LeU); break;
+    case GtSInt32:      o << int8_t(BinaryConsts::I32GtS); break;
+    case GtUInt32:      o << int8_t(BinaryConsts::I32GtU); break;
+    case GeSInt32:      o << int8_t(BinaryConsts::I32GeS); break;
+    case GeUInt32:      o << int8_t(BinaryConsts::I32GeU); break;
+
+    case AddInt64:      o << int8_t(BinaryConsts::I64Add); break;
+    case SubInt64:      o << int8_t(BinaryConsts::I64Sub); break;
+    case MulInt64:      o << int8_t(BinaryConsts::I64Mul); break;
+    case DivSInt64:     o << int8_t(BinaryConsts::I64DivS); break;
+    case DivUInt64:     o << int8_t(BinaryConsts::I64DivU); break;
+    case RemSInt64:     o << int8_t(BinaryConsts::I64RemS); break;
+    case RemUInt64:     o << int8_t(BinaryConsts::I64RemU); break;
+    case AndInt64:      o << int8_t(BinaryConsts::I64And); break;
+    case OrInt64:       o << int8_t(BinaryConsts::I64Or); break;
+    case XorInt64:      o << int8_t(BinaryConsts::I64Xor); break;
+    case ShlInt64:      o << int8_t(BinaryConsts::I64Shl); break;
+    case ShrUInt64:     o << int8_t(BinaryConsts::I64ShrU); break;
+    case ShrSInt64:     o << int8_t(BinaryConsts::I64ShrS); break;
+    case RotLInt64:     o << int8_t(BinaryConsts::I64RotL); break;
+    case RotRInt64:     o << int8_t(BinaryConsts::I64RotR); break;
+    case EqInt64:       o << int8_t(BinaryConsts::I64Eq); break;
+    case NeInt64:       o << int8_t(BinaryConsts::I64Ne); break;
+    case LtSInt64:      o << int8_t(BinaryConsts::I64LtS); break;
+    case LtUInt64:      o << int8_t(BinaryConsts::I64LtU); break;
+    case LeSInt64:      o << int8_t(BinaryConsts::I64LeS); break;
+    case LeUInt64:      o << int8_t(BinaryConsts::I64LeU); break;
+    case GtSInt64:      o << int8_t(BinaryConsts::I64GtS); break;
+    case GtUInt64:      o << int8_t(BinaryConsts::I64GtU); break;
+    case GeSInt64:      o << int8_t(BinaryConsts::I64GeS); break;
+    case GeUInt64:      o << int8_t(BinaryConsts::I64GeU); break;
+
+    case AddFloat32:      o << int8_t(BinaryConsts::F32Add); break;
+    case SubFloat32:      o << int8_t(BinaryConsts::F32Sub); break;
+    case MulFloat32:      o << int8_t(BinaryConsts::F32Mul); break;
+    case DivFloat32:      o << int8_t(BinaryConsts::F32Div); break;
     case CopySignFloat32: o << int8_t(BinaryConsts::F32CopySign);break;
-    case MinFloat32:      o << int8_t(BinaryConsts::F32Min);     break;
-    case MaxFloat32:      o << int8_t(BinaryConsts::F32Max);     break;
-    case EqFloat32:       o << int8_t(BinaryConsts::F32Eq);      break;
-    case NeFloat32:       o << int8_t(BinaryConsts::F32Ne);      break;
-    case LtFloat32:       o << int8_t(BinaryConsts::F32Lt);      break;
-    case LeFloat32:       o << int8_t(BinaryConsts::F32Le);      break;
-    case GtFloat32:       o << int8_t(BinaryConsts::F32Gt);      break;
-    case GeFloat32:       o << int8_t(BinaryConsts::F32Ge);      break;
-
-    case AddFloat64:      o << int8_t(BinaryConsts::F64Add);     break;
-    case SubFloat64:      o << int8_t(BinaryConsts::F64Sub);     break;
-    case MulFloat64:      o << int8_t(BinaryConsts::F64Mul);     break;
-    case DivFloat64:      o << int8_t(BinaryConsts::F64Div);     break;
+    case MinFloat32:      o << int8_t(BinaryConsts::F32Min); break;
+    case MaxFloat32:      o << int8_t(BinaryConsts::F32Max); break;
+    case EqFloat32:       o << int8_t(BinaryConsts::F32Eq); break;
+    case NeFloat32:       o << int8_t(BinaryConsts::F32Ne); break;
+    case LtFloat32:       o << int8_t(BinaryConsts::F32Lt); break;
+    case LeFloat32:       o << int8_t(BinaryConsts::F32Le); break;
+    case GtFloat32:       o << int8_t(BinaryConsts::F32Gt); break;
+    case GeFloat32:       o << int8_t(BinaryConsts::F32Ge); break;
+
+    case AddFloat64:      o << int8_t(BinaryConsts::F64Add); break;
+    case SubFloat64:      o << int8_t(BinaryConsts::F64Sub); break;
+    case MulFloat64:      o << int8_t(BinaryConsts::F64Mul); break;
+    case DivFloat64:      o << int8_t(BinaryConsts::F64Div); break;
     case CopySignFloat64: o << int8_t(BinaryConsts::F64CopySign);break;
-    case MinFloat64:      o << int8_t(BinaryConsts::F64Min);     break;
-    case MaxFloat64:      o << int8_t(BinaryConsts::F64Max);     break;
-    case EqFloat64:       o << int8_t(BinaryConsts::F64Eq);      break;
-    case NeFloat64:       o << int8_t(BinaryConsts::F64Ne);      break;
-    case LtFloat64:       o << int8_t(BinaryConsts::F64Lt);      break;
-    case LeFloat64:       o << int8_t(BinaryConsts::F64Le);      break;
-    case GtFloat64:       o << int8_t(BinaryConsts::F64Gt);      break;
-    case GeFloat64:       o << int8_t(BinaryConsts::F64Ge);      break;
+    case MinFloat64:      o << int8_t(BinaryConsts::F64Min); break;
+    case MaxFloat64:      o << int8_t(BinaryConsts::F64Max); break;
+    case EqFloat64:       o << int8_t(BinaryConsts::F64Eq); break;
+    case NeFloat64:       o << int8_t(BinaryConsts::F64Ne); break;
+    case LtFloat64:       o << int8_t(BinaryConsts::F64Lt); break;
+    case LeFloat64:       o << int8_t(BinaryConsts::F64Le); break;
+    case GtFloat64:       o << int8_t(BinaryConsts::F64Gt); break;
+    case GeFloat64:       o << int8_t(BinaryConsts::F64Ge); break;
     default: abort();
   }
   if (curr->type == unreachable) {
@@ -2295,7 +2295,7 @@ BinaryConsts::ASTNodes WasmBinaryBuilder::readExpression(Expression*& curr) {
   if (debug) std::cerr << "readExpression seeing " << (int)code << std::endl;
   switch (code) {
     case BinaryConsts::Block:        visitBlock((curr = allocator.alloc<Block>())->cast<Block>()); break;
-    case BinaryConsts::If:           visitIf((curr = allocator.alloc<If>())->cast<If>());  break;
+    case BinaryConsts::If:           visitIf((curr = allocator.alloc<If>())->cast<If>()); break;
     case BinaryConsts::Loop:         visitLoop((curr = allocator.alloc<Loop>())->cast<Loop>()); break;
     case BinaryConsts::Br:
     case BinaryConsts::BrIf:         visitBreak((curr = allocator.alloc<Break>())->cast<Break>(), code); break; // code distinguishes br from br_if