Refactor type propagation.

lib/compiler/implementation/ssa/bailout.dart

 // Copyright (c) 2012, 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.
 
 class BailoutInfo {
   int instructionId;
   int bailoutId;
   BailoutInfo(this.instructionId, this.bailoutId);
 }
 
@@ skipping 258 matching lines @@
     environment.clear();
     visitInstruction(instruction);
   }
 
   void visitControlFlow(HControlFlow instruction) {
     compiler.internalError('Control flow instructions already dealt with.',
                            instruction: instruction);
   }
 
   bool shouldCaptureEnvironment(HInstruction instruction) {
-    return instruction.type.isKnown() && !instruction.hasExpectedType();
+    HType propagatedType = instruction.propagatedType;
+    return propagatedType.isUseful()
+        && propagatedType != instruction.computeTypeFromInputTypes();
   }
 
   void insertCapturedEnvironments() {
     work.guards = <HTypeGuard>[];
     int state = 1;
     capturedEnvironments.forEach((HInstruction instruction, Environment env) {
       List<HInstruction> inputs = env.buildAndSetLast(instruction);
       HTypeGuard guard = new HTypeGuard(state++, inputs);
       work.guards.add(guard);
       instruction.block.rewrite(instruction, guard);
@@ skipping 69 matching lines @@
     compiler.internalError('Control flow instructions already dealt with.',
                            instruction: instruction);
   }
 
   visitTypeGuard(HTypeGuard guard) {
     blocks.forEach((HBasicBlock block) {
       block.guards.add(guard);
     });
   }
 }