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

runtime/vm/intermediate_language_x64.cc

Index: runtime/vm/intermediate_language_x64.cc
diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc
index ba50319b5fd7ef0b43a8d69e7c5603b7c255d4e0..021684a1423c06c07297c599d3bdca049f764aa3 100644
--- a/runtime/vm/intermediate_language_x64.cc
+++ b/runtime/vm/intermediate_language_x64.cc
@@ -205,10 +205,6 @@ void AssertBooleanComp::EmitNativeCode(FlowGraphCompiler* compiler) {
 
 
 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) &&
@@ -216,8 +212,7 @@ LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
     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());
@@ -230,8 +225,7 @@ LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
     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());
@@ -243,8 +237,7 @@ LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
   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()) {
@@ -439,17 +432,12 @@ void EqualityCompareComp::EmitNativeCode(FlowGraphCompiler* compiler) {
 
 
 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()) {