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

runtime/vm/intermediate_language_ia32.cc

Index: runtime/vm/intermediate_language_ia32.cc
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc
index db90a0acd970923c51afcab17a218e6ca2d5fbe3..1b04ccbda8c954e4f103ae2a87f99ad04b7098ac 100644
--- a/runtime/vm/intermediate_language_ia32.cc
+++ b/runtime/vm/intermediate_language_ia32.cc
@@ -197,10 +197,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) &&
@@ -208,8 +204,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());
@@ -222,8 +217,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());
@@ -235,8 +229,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()) {
@@ -431,17 +424,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::kNoCall,
-                                                   contains_branch);
+                                                   LocationSummary::kNoCall);
     summary->set_in(0, Location::RequiresRegister());
     summary->set_in(1, Location::RequiresRegister());
     if (!is_fused_with_branch()) {