1 files changed, 24 insertions, 18 deletions

diff --git a/src/passes/Flatten.cpp b/src/passes/Flatten.cpp
index df6be947d..a68fc9abe 100644
--- a/src/passes/Flatten.cpp
+++ b/src/passes/Flatten.cpp
@@ -18,13 +18,13 @@
 // Flattens code into "Flat IR" form. See ir/flat.h.
 //
 
-#include <wasm.h>
-#include <pass.h>
-#include <wasm-builder.h>
 #include <ir/branch-utils.h>
 #include <ir/effects.h>
 #include <ir/flat.h>
 #include <ir/utils.h>
+#include <pass.h>
+#include <wasm-builder.h>
+#include <wasm.h>
 
 namespace wasm {
 
@@ -43,12 +43,15 @@ namespace wasm {
 // Once exception is that we allow an (unreachable) node, which is used
 // when we move something unreachable to another place, and need a
 // placeholder. We will never reach that (unreachable) anyhow
-struct Flatten : public WalkerPass<ExpressionStackWalker<Flatten, UnifiedExpressionVisitor<Flatten>>> {
+struct Flatten
+  : public WalkerPass<
+      ExpressionStackWalker<Flatten, UnifiedExpressionVisitor<Flatten>>> {
   bool isFunctionParallel() override { return true; }
 
   Pass* create() override { return new Flatten; }
 
-  // For each expression, a bunch of expressions that should execute right before it
+  // For each expression, a bunch of expressions that should execute right
+  // before it
   std::unordered_map<Expression*, std::vector<Expression*>> preludes;
 
   // Break values are sent through a temp local
@@ -61,7 +64,9 @@ struct Flatten : public WalkerPass<ExpressionStackWalker<Flatten, UnifiedExpress
     if (Flat::isControlFlowStructure(curr)) {
       // handle control flow explicitly. our children do not have control flow,
       // but they do have preludes which we need to set up in the right place
-      assert(preludes.find(curr) == preludes.end()); // no one should have given us preludes, they are on the children
+
+      // no one should have given us preludes, they are on the children
+      assert(preludes.find(curr) == preludes.end());
       if (auto* block = curr->dynCast<Block>()) {
         // make a new list, where each item's preludes are added before it
         ExpressionList newList(getModule()->allocator);
@@ -123,7 +128,9 @@ struct Flatten : public WalkerPass<ExpressionStackWalker<Flatten, UnifiedExpress
           rep = builder.makeGetLocal(temp, type);
         }
         iff->ifTrue = getPreludesWithExpression(originalIfTrue, iff->ifTrue);
-        if (iff->ifFalse) iff->ifFalse = getPreludesWithExpression(originalIfFalse, iff->ifFalse);
+        if (iff->ifFalse)
+          iff->ifFalse =
+            getPreludesWithExpression(originalIfFalse, iff->ifFalse);
         iff->finalize();
         if (prelude) {
           ReFinalizeNode().visit(prelude);
@@ -204,10 +211,9 @@ struct Flatten : public WalkerPass<ExpressionStackWalker<Flatten, UnifiedExpress
             // we don't know which break target will be hit - assign to them all
             auto names = BranchUtils::getUniqueTargets(sw);
             for (auto name : names) {
-              ourPreludes.push_back(builder.makeSetLocal(
-                getTempForBreakTarget(name, type),
-                builder.makeGetLocal(temp, type)
-              ));
+              ourPreludes.push_back(
+                builder.makeSetLocal(getTempForBreakTarget(name, type),
+                                     builder.makeGetLocal(temp, type)));
             }
             sw->value = nullptr;
             sw->finalize();
@@ -275,9 +281,11 @@ private:
 
   // gets an expression, either by itself, or in a block with some
   // preludes (which we use up) for another expression before it
-  Expression* getPreludesWithExpression(Expression* preluder, Expression* after) {
+  Expression* getPreludesWithExpression(Expression* preluder,
+                                        Expression* after) {
     auto iter = preludes.find(preluder);
-    if (iter == preludes.end()) return after;
+    if (iter == preludes.end())
+      return after;
     // we have preludes
     auto& thePreludes = iter->second;
     auto* ret = Builder(*getModule()).makeBlock(thePreludes);
@@ -294,14 +302,12 @@ private:
     if (iter != breakTemps.end()) {
       return iter->second;
     } else {
-      return breakTemps[name] = Builder(*getModule()).addVar(getFunction(), type);
+      return breakTemps[name] =
+               Builder(*getModule()).addVar(getFunction(), type);
     }
   }
 };
 
-Pass *createFlattenPass() {
-  return new Flatten();
-}
+Pass* createFlattenPass() { return new Flatten(); }
 
 } // namespace wasm
-