Implement condition type checks in new compiler, thereby removing last bailouts.

runtime/vm/flow_graph_builder.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 257 matching lines @@
 // TargetEntryInstr*.
 //
 // To distinguish between the graphs with only nonlocal exits and graphs
 // with both true and false exits, there are a pair of TargetEntryInstr**:
 //
 //   - Both NULL: only non-local exits, truly closed
 //   - Neither NULL: true and false successors at the given addresses
 //
 // We expect that AstNode in test contexts either have only nonlocal exits
 // or else control flow has both true and false successors.
 class TestGraphVisitor : public ValueGraphVisitor {

[srdjan, 2012/04/16 23:52:38]

Please add a comment why we need the node id and token index. I think the code
would be simpler if you would always pass node_id and token index to the
constructor.

[regis, 2012/04/17 00:17:18]

Added comment and removed the setters. Both condition_node_id and
condition_token_index are now passed to the constructor.

  public:
   TestGraphVisitor(FlowGraphBuilder* owner, intptr_t temp_index)
       : ValueGraphVisitor(owner, temp_index),
         true_successor_address_(NULL),
-        false_successor_address_(NULL) {
+        false_successor_address_(NULL),
+        node_id_(AstNode::kNoId),
+        token_index_(0) {
   }
 
   // Visit functions overridden by this class.
   virtual void VisitLiteralNode(LiteralNode* node);
   virtual void VisitLoadLocalNode(LoadLocalNode* node);
 
   TargetEntryInstr** true_successor_address() const {
     ASSERT(true_successor_address_ != NULL);
     return true_successor_address_;
   }
   TargetEntryInstr** false_successor_address() const {
     ASSERT(false_successor_address_ != NULL);
     return false_successor_address_;
   }
 
+  intptr_t node_id() const { return node_id_; }
+  void set_node_id(intptr_t node_id) { node_id_ = node_id; }
+  intptr_t token_index() const { return token_index_; }
+  void set_token_index(intptr_t token_index) { token_index_ = token_index; }
+
  private:
   // Construct and concatenate a Branch instruction to this graph fragment.
   // Closes the fragment and sets the output parameters.
   virtual void ReturnValue(Value* value);
 
   // Specify a computation as the final result.  Adds a Bind instruction to
   // the graph and branches on its value.
   virtual void ReturnComputation(Computation* computation) {
     AddInstruction(new BindInstr(temp_index(), computation));
     ReturnValue(new TempVal(temp_index()));
   }
 
   // Output parameters.
   TargetEntryInstr** true_successor_address_;
   TargetEntryInstr** false_successor_address_;
+
+  intptr_t node_id_;
+  intptr_t token_index_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_