During bailout construction add condition instructions to list of live variables.

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 187 matching lines @@
 
     if (instruction.hasElse) {
       environment = elseEnvironment;
       visitSubGraph(info.elseGraph);
       elseEnvironment = environment;
     }
 
     environment = thenEnvironment;
     visitSubGraph(info.thenGraph);
     environment.addAll(elseEnvironment);
+    environment.add(instruction.condition);

[ngeoffray, 2012/03/30 08:18:50]

Maybe call visitInstruction instead? I know it ends up doing just this, but it
may be safer to call it.

[floitsch, 2012/03/30 17:54:27]

done. But be aware that this became visitInstruction(instruction) and not
visitInstruction(instruction.condition).

   }
 
   void visitGoto(HGoto goto) {
     HBasicBlock block = goto.block;
     if (block.successors[0].dominator != block) return;
     visitBasicBlock(block.successors[0]);
   }
 
   void visitBreak(HBreak breakInstruction) {
     compiler.unimplemented("SsaEnvironmentBuilder.visitBreak");
@@ skipping 27 matching lines @@
     environment.addLoopMarker(header);
 
     if (!branch.isDoWhile()) {
       assert(block.successors[0] == block.dominatedBlocks[0]);
       visitBasicBlock(block.successors[0]);
     }
 
     // We merge the environment required by the code after the loop,
     // and the code inside the loop.
     environment.addAll(joinEnvironment);
+    environment.add(branch.condition);

[ngeoffray, 2012/03/30 08:18:50]

ditto

[floitsch, 2012/03/30 17:54:27]

ditto (done, but visitInstruction(branch)).

   }
 
   // Deal with all kinds of control flow instructions. In case we add
   // a new one, we will hit an internal error.
   void visitExit(HExit exit) {}
 
   void visitReturn(HReturn instruction) {
     environment.clear();
     visitInstruction(instruction);
   }
@@ skipping 92 matching lines @@
     compiler.internalError('Control flow instructions already dealt with.',
                            instruction: instruction);
   }
 
   visitTypeGuard(HTypeGuard guard) {
     blocks.forEach((HBasicBlock block) {
       block.guards.add(guard);
     });
   }
 }