In full-printing mode, print comments for control flow endings, to help readability (WebAssembly#1552)

kripken · web-flow · commit 4615f00d6fdc · 2018-05-14T18:52:49.000-07:00
Like this:

(block $x
  ..
) ;; end block $x

Also fix some current breakage on master.
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
@@ -157,13 +157,26 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
         if (curr != top && i == 0) {
           // one of the block recursions we already handled
           decIndent();
+          if (full) {
+            o << " ;; end block";
+            auto* child = list[0]->cast<Block>();
+            if (child->name.is()) {
+              o << ' ' << child->name;
+            }
+          }
           o << '\n';
           continue;
         }
         printFullLine(list[i]);
       }
     }
     decIndent();
+    if (full) {
+      o << " ;; end block";
+      if (curr->name.is()) {
+        o << ' ' << curr->name;
+      }
+    }
   }
   void visitIf(If *curr) {
     printOpening(o, "if");
@@ -186,6 +199,9 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
       }
     }
     decIndent();
+    if (full) {
+      o << " ;; end if";
+    }
   }
   void visitLoop(Loop *curr) {
     printOpening(o, "loop");
@@ -207,6 +223,12 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
       printFullLine(curr->body);
     }
     decIndent();
+    if (full) {
+      o << " ;; end loop";
+      if (curr->name.is()) {
+        o << ' ' << curr->name;
+      }
+    }
   }
   void visitBreak(Break *curr) {
     if (curr->condition) {
diff --git a/test/wasm2asm/i64-rotate.2asm.js b/test/wasm2asm/i64-rotate.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  var Math_clz32 = global.Math.clz32;
  var Math_min = global.Math.min;
  var Math_max = global.Math.max;
+ var Math_floor = global.Math.floor;
+ var Math_ceil = global.Math.ceil;
+ var Math_sqrt = global.Math.sqrt;
  var i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   

Original file line number	Diff line number	Diff line change
`@@ -157,13 +157,26 @@ struct PrintSExpression : public Visitor<PrintSExpression> {`
`157`	`157`	`if (curr != top && i == 0) {`
`158`	`158`	`// one of the block recursions we already handled`
`159`	`159`	`decIndent();`
	`160`	`+ if (full) {`
	`161`	`+ o << " ;; end block";`
	`162`	`+ auto* child = list[0]->cast<Block>();`
	`163`	`+ if (child->name.is()) {`
	`164`	`+ o << ' ' << child->name;`
	`165`	`+ }`
	`166`	`+ }`
`160`	`167`	`o << '\n';`
`161`	`168`	`continue;`
`162`	`169`	`}`
`163`	`170`	`printFullLine(list[i]);`
`164`	`171`	`}`
`165`	`172`	`}`
`166`	`173`	`decIndent();`
	`174`	`+ if (full) {`
	`175`	`+ o << " ;; end block";`
	`176`	`+ if (curr->name.is()) {`
	`177`	`+ o << ' ' << curr->name;`
	`178`	`+ }`
	`179`	`+ }`
`167`	`180`	`}`
`168`	`181`	`void visitIf(If *curr) {`
`169`	`182`	`printOpening(o, "if");`
`@@ -186,6 +199,9 @@ struct PrintSExpression : public Visitor<PrintSExpression> {`
`186`	`199`	`}`
`187`	`200`	`}`
`188`	`201`	`decIndent();`
	`202`	`+ if (full) {`
	`203`	`+ o << " ;; end if";`
	`204`	`+ }`
`189`	`205`	`}`
`190`	`206`	`void visitLoop(Loop *curr) {`
`191`	`207`	`printOpening(o, "loop");`
`@@ -207,6 +223,12 @@ struct PrintSExpression : public Visitor<PrintSExpression> {`
`207`	`223`	`printFullLine(curr->body);`
`208`	`224`	`}`
`209`	`225`	`decIndent();`
	`226`	`+ if (full) {`
	`227`	`+ o << " ;; end loop";`
	`228`	`+ if (curr->name.is()) {`
	`229`	`+ o << ' ' << curr->name;`
	`230`	`+ }`
	`231`	`+ }`
`210`	`232`	`}`
`211`	`233`	`void visitBreak(Break *curr) {`
`212`	`234`	`if (curr->condition) {`