Change comparison-to-branch fusion to actually remove comparison from the graph.

runtime/vm/locations.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_LOCATIONS_H_
 #define VM_LOCATIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/bitfield.h"
@@ skipping 87 matching lines @@
 
 
 // Specification of locations for inputs and output.
 class LocationSummary : public ZoneAllocated {
  public:
   enum ContainsCall {
     kNoCall,
     kCall,
   };
 
-  enum ContainsBranch {
-    kNoBranch,
-    kBranch
-  };
-
   // TODO(vegorov): remove unsafe kNoCall default.
   LocationSummary(intptr_t input_count,
                   intptr_t temp_count,
-                  ContainsCall call = kNoCall,
-                  ContainsBranch branch = kNoBranch)
+                  ContainsCall call = kNoCall)
       : input_locations_(input_count),
         temp_locations_(temp_count),
         output_location_(),
-        is_call_(call == kCall),
-        is_branch_(branch == kBranch) {
+        is_call_(call == kCall) {
     for (intptr_t i = 0; i < input_count; i++) {
       input_locations_.Add(Location());
     }
     for (intptr_t i = 0; i < temp_count; i++) {
       temp_locations_.Add(Location());
     }
   }
 
   intptr_t input_count() const {
     return input_locations_.length();
@@ skipping 24 matching lines @@
   }
 
   void set_out(Location loc) {
     output_location_ = loc;
   }
 
   bool is_call() const {
     return is_call_;
   }
 
-  // TODO(vegorov): this is a temporary solution. Once we will start removing
-  // comparison operations from the flow graph when they are fused with a branch
-  // we should eliminate this.
-  bool is_branch() const {
-    return is_branch_;
-  }
-
   static LocationSummary* Make(intptr_t input_count,
                                Location out,
-                               ContainsCall contains_call = kNoCall,
-                               ContainsBranch contains_branch = kNoBranch);
+                               ContainsCall contains_call = kNoCall);
 
  private:
   // TODO(vegorov): replace with ZoneArray.
   GrowableArray<Location> input_locations_;
   GrowableArray<Location> temp_locations_;
   Location output_location_;
 
   const bool is_call_;
-  const bool is_branch_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_LOCATIONS_H_