Reapply "Simplify generated code for trivial bailout methods".

lib/compiler/implementation/ssa/nodes.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 interface HVisitor<R> {
   R visitAdd(HAdd node);
   R visitBitAnd(HBitAnd node);
   R visitBitNot(HBitNot node);
   R visitBitOr(HBitOr node);
   R visitBitXor(HBitXor node);
@@ skipping 967 matching lines @@
 abstract class HCheck extends HInstruction {
   HCheck(inputs) : super(inputs);
   HInstruction get checkedInput() => inputs[0];
   bool isStatement() => true;
 }
 
 class HTypeGuard extends HCheck {
   final int state;
   final HType guardedType;
   bool isOn = false;
+  int checkedInputIndex = 0;
+
   HTypeGuard(this.guardedType, this.state, List<HInstruction> env) : super(env);
 
   void prepareGvn() {
     assert(!hasSideEffects());
     setUseGvn();
   }
 
-  HInstruction get guarded() => inputs.last();
+  HInstruction get guarded() => inputs[checkedInputIndex];
   HInstruction get checkedInput() => guarded;
 
   HType computeTypeFromInputTypes() {
     return isOn ? guardedType : guarded.propagatedType;
   }
 
   HType get guaranteedType() => isOn ? guardedType : HType.UNKNOWN;
 
   bool isControlFlow() => true;
 
   accept(HVisitor visitor) => visitor.visitTypeGuard(this);
   int typeCode() => 1;
   bool typeEquals(other) => other is HTypeGuard;
-  bool dataEquals(HTypeGuard other) => guardedType == other.guardedType;
+  bool dataEquals(HTypeGuard other) {
+    return guarded == other.guarded && guardedType == other.guardedType;
+  }
 }
 
 class HBoundsCheck extends HCheck {
   static final int ALWAYS_FALSE = 0;
   static final int FULL_CHECK = 1;
   static final int ALWAYS_ABOVE_ZERO = 2;
   static final int ALWAYS_TRUE = 3;
   /**
    * Details which tests have been done statically during compilation.
    * Default is that all checks must be performed dynamically.
@@ skipping 1464 matching lines @@
                         this.labels);
 
   HBasicBlock get start() {
     if (initializer !== null) return initializer.start;
     if (kind == DO_WHILE_LOOP) {
       return body.start;
     }
     return condition.start;
   }
 
+  HBasicBlock get loopHeader() {
+    return kind == DO_WHILE_LOOP ? body.start : condition.start;
+  }
+
   HBasicBlock get end() {
     if (updates !== null) return updates.end;
     if (kind == DO_WHILE_LOOP) {
       return condition.end;
     }
     return body.end;
   }
 
   static int loopType(Node node) {
     return node.accept(const LoopTypeVisitor());
@@ skipping 77 matching lines @@
   HBasicBlock get start() => expression.start;
   HBasicBlock get end() {
     // We don't create a switch block if there are no cases.
     assert(!statements.isEmpty());
     return statements.last().end;
   }
 
   bool accept(HStatementInformationVisitor visitor) =>
       visitor.visitSwitchInfo(this);
 }