[dart2js] new-rti: Fix generator header-body merge optimization

rakudrama · commit-bot@chromium.org · commit 01a679ba735d · 2019-08-07T23:14:35.000Z
Change-Id: Id4f038415990f5379c1a01637b53c398f5325449 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112270 Reviewed-by: Mayank Patke <fishythefish@google.com> Commit-Queue: Stephen Adams <sra@google.com>
diff --git a/pkg/compiler/lib/src/ssa/builder_kernel.dart b/pkg/compiler/lib/src/ssa/builder_kernel.dart
@@ -1426,6 +1426,7 @@ class KernelSsaGraphBuilder extends ir.Visitor {
     if (block.id != 1) return false;
     for (HInstruction node = block.first; node != null; node = node.next) {
       if (node is HGoto) continue;
+      if (node is HLoadType) continue; // Orphaned if check is redundant.
       return false;
     }
     return true;
diff --git a/pkg/compiler/lib/src/ssa/type_builder.dart b/pkg/compiler/lib/src/ssa/type_builder.dart
@@ -85,6 +85,9 @@ abstract class TypeBuilder {
     if (other is HTypeConversion && other.isRedundant(builder.closedWorld)) {
       return original;
     }
+    if (other is HAsCheck && other.isRedundant(builder.closedWorld)) {
+      return original;
+    }
     return other;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1426,6 +1426,7 @@ class KernelSsaGraphBuilder extends ir.Visitor {`
`1426`	`1426`	`if (block.id != 1) return false;`
`1427`	`1427`	`for (HInstruction node = block.first; node != null; node = node.next) {`
`1428`	`1428`	`if (node is HGoto) continue;`
	`1429`	`+ if (node is HLoadType) continue; // Orphaned if check is redundant.`
`1429`	`1430`	`return false;`
`1430`	`1431`	`}`
`1431`	`1432`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ abstract class TypeBuilder {`
`85`	`85`	`if (other is HTypeConversion && other.isRedundant(builder.closedWorld)) {`
`86`	`86`	`return original;`
`87`	`87`	`}`
	`88`	`+ if (other is HAsCheck && other.isRedundant(builder.closedWorld)) {`
	`89`	`+ return original;`
	`90`	`+ }`
`88`	`91`	`return other;`
`89`	`92`	`}`
`90`	`93`