VM: Remove unused optimization of merging of sin/cos.

runtime/vm/flow_graph.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/flow_graph.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
@@ skipping 2034 matching lines @@
             it.Current()->AsInvokeMathCFunction();
         if ((math_unary->recognized_kind() == MethodRecognizer::kMathSin) ||
             (math_unary->recognized_kind() == MethodRecognizer::kMathCos)) {
           if (math_unary->HasUses()) {
             sin_cos_merge.Add(math_unary);
           }
         }
       }
     }
     TryMergeTruncDivMod(&div_mod_merge);
-    TryMergeMathUnary(&sin_cos_merge);
   }
 }
 
 
 // Returns true if use is dominated by the given instruction.
 // Note: uses that occur at instruction itself are not dominated by it.
 static bool IsDominatedUse(Instruction* dom, Value* use) {
   BlockEntryInstr* dom_block = dom->GetBlock();
 
   Instruction* instr = use->instruction();
@@ skipping 152 matching lines @@
         // Only one merge possible. Because canonicalization happens later,
         // more candidates are possible.
         // TODO(srdjan): Allow merging of trunc-div/mod into truncDivMod.
         break;
       }
     }
   }
 }
 
 
-// Tries to merge MathUnary operations, in this case sine and cosine.
-void FlowGraph::TryMergeMathUnary(
-    GrowableArray<InvokeMathCFunctionInstr*>* merge_candidates) {
-  if (!FlowGraphCompiler::SupportsSinCos() || !CanUnboxDouble() ||
-      !FLAG_merge_sin_cos) {
-    return;
-  }
-  if (merge_candidates->length() < 2) {
-    // Need at least a SIN and a COS.
-    return;
-  }
-  for (intptr_t i = 0; i < merge_candidates->length(); i++) {
-    InvokeMathCFunctionInstr* curr_instr = (*merge_candidates)[i];
-    if (curr_instr == NULL) {
-      // Instruction was merged already.
-      continue;
-    }
-    const MethodRecognizer::Kind kind = curr_instr->recognized_kind();
-    ASSERT((kind == MethodRecognizer::kMathSin) ||
-           (kind == MethodRecognizer::kMathCos));
-    // Check if there is sin/cos binop with same inputs.
-    const MethodRecognizer::Kind other_kind =
-        (kind == MethodRecognizer::kMathSin) ? MethodRecognizer::kMathCos
-                                             : MethodRecognizer::kMathSin;
-    Definition* def = curr_instr->InputAt(0)->definition();
-    for (intptr_t k = i + 1; k < merge_candidates->length(); k++) {
-      InvokeMathCFunctionInstr* other_op = (*merge_candidates)[k];
-      // 'other_op' can be NULL if it was already merged.
-      if ((other_op != NULL) && (other_op->recognized_kind() == other_kind) &&
-          (other_op->InputAt(0)->definition() == def)) {
-        (*merge_candidates)[k] = NULL;  // Clear it.
-        ASSERT(curr_instr->HasUses());
-        AppendExtractNthOutputForMerged(curr_instr,
-                                        MergedMathInstr::OutputIndexOf(kind),
-                                        kUnboxedDouble, kDoubleCid);
-        ASSERT(other_op->HasUses());
-        AppendExtractNthOutputForMerged(
-            other_op, MergedMathInstr::OutputIndexOf(other_kind),
-            kUnboxedDouble, kDoubleCid);
-        ZoneGrowableArray<Value*>* args = new (Z) ZoneGrowableArray<Value*>(1);
-        args->Add(new (Z) Value(curr_instr->InputAt(0)->definition()));
-        // Replace with SinCos.
-        MergedMathInstr* sin_cos = new (Z) MergedMathInstr(
-            args, curr_instr->DeoptimizationTarget(), MergedMathInstr::kSinCos);
-        curr_instr->ReplaceWith(sin_cos, NULL);
-        other_op->ReplaceUsesWith(sin_cos);
-        other_op->RemoveFromGraph();
-        // Only one merge possible. Because canonicalization happens later,
-        // more candidates are possible.
-        // TODO(srdjan): Allow merging of sin/cos into sincos.
-        break;
-      }
-    }
-  }
-}
-
-
 void FlowGraph::AppendExtractNthOutputForMerged(Definition* instr,
                                                 intptr_t index,
                                                 Representation rep,
                                                 intptr_t cid) {
   ExtractNthOutputInstr* extract =
       new (Z) ExtractNthOutputInstr(new (Z) Value(instr), index, rep, cid);
   instr->ReplaceUsesWith(extract);
   InsertAfter(instr, extract, NULL, FlowGraph::kValue);
 }
 
 
 }  // namespace dart