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

runtime/vm/intermediate_language_x64.cc

 // 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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 187 matching lines @@
                                 kConditionTypeErrorRuntimeEntry);
   // We should never return here.
   __ int3();
 
   __ Bind(&done);
   ASSERT(obj == result);
 }
 
 
 LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
-  const LocationSummary::ContainsBranch contains_branch =
-      is_fused_with_branch() ? LocationSummary::kBranch
-                             : LocationSummary::kNoBranch;
-
   const intptr_t kNumInputs = 2;
   if (HasICData() &&
       (ic_data()->NumberOfChecks() == 1) &&
       (ic_data()->GetReceiverClassIdAt(0) == kSmi)) {
     const intptr_t kNumTemps = 1;
     LocationSummary* locs = new LocationSummary(kNumInputs,
                                                 kNumTemps,
-                                                LocationSummary::kNoCall,
-                                                contains_branch);
+                                                LocationSummary::kNoCall);
     locs->set_in(0, Location::RequiresRegister());
     locs->set_in(1, Location::RequiresRegister());
     locs->set_temp(0, Location::RequiresRegister());
     if (!is_fused_with_branch()) {
       locs->set_out(Location::RequiresRegister());
     }
     return locs;
   }
   if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
     const intptr_t kNumTemps = 1;
     LocationSummary* locs = new LocationSummary(kNumInputs,
                                                 kNumTemps,
-                                                LocationSummary::kCall,
-                                                contains_branch);
+                                                LocationSummary::kCall);
     locs->set_in(0, Location::RequiresRegister());
     locs->set_in(1, Location::RequiresRegister());
     locs->set_temp(0, Location::RequiresRegister());
     if (!is_fused_with_branch()) {
       locs->set_out(Location::RegisterLocation(RAX));
     }
     return locs;
   }
   const intptr_t kNumTemps = 0;
   LocationSummary* locs = new LocationSummary(kNumInputs,
                                               kNumTemps,
-                                              LocationSummary::kCall,
-                                              contains_branch);
+                                              LocationSummary::kCall);
   locs->set_in(0, Location::RequiresRegister());
   locs->set_in(1, Location::RequiresRegister());
   if (!is_fused_with_branch()) {
     locs->set_out(Location::RegisterLocation(RAX));
   }
   return locs;
 }
 
 
 static void EmitSmiEqualityCompare(FlowGraphCompiler* compiler,
@@ skipping 174 matching lines @@
       (ic_data()->NumberOfChecks() == 1) &&
       (ic_data()->GetReceiverClassIdAt(0) == kSmi)) {
     EmitSmiEqualityCompare(compiler, this);
     return;
   }
   EmitGenericEqualityCompare(compiler, this);
 }
 
 
 LocationSummary* RelationalOpComp::MakeLocationSummary() const {
-  const LocationSummary::ContainsBranch contains_branch =
-      is_fused_with_branch() ? LocationSummary::kBranch
-                             : LocationSummary::kNoBranch;
-
   if (operands_class_id() == kSmi || operands_class_id() == kDouble) {
     const intptr_t kNumInputs = 2;
     const intptr_t kNumTemps = 1;
     LocationSummary* summary = new LocationSummary(kNumInputs,
                                                    kNumTemps,
-                                                   LocationSummary::kCall,
-                                                   contains_branch);
+                                                   LocationSummary::kCall);
     summary->set_in(0, Location::RequiresRegister());
     summary->set_in(1, Location::RequiresRegister());
     if (!is_fused_with_branch()) {
       summary->set_out(Location::RequiresRegister());
     }
     summary->set_temp(0, Location::RequiresRegister());
     return summary;
   }
   ASSERT(!is_fused_with_branch());
   ASSERT(operands_class_id() == kObject);
@@ skipping 1516 matching lines @@
                                  instance_call()->argument_names());
   }
   __ Bind(&done);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64