| Index: runtime/vm/intermediate_language.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language.cc (revision 26445)
|
| +++ runtime/vm/intermediate_language.cc (working copy)
|
| @@ -2528,7 +2528,7 @@
|
|
|
| InvokeMathCFunctionInstr::InvokeMathCFunctionInstr(
|
| ZoneGrowableArray<Value*>* inputs,
|
| - InstanceCallInstr* instance_call,
|
| + intptr_t original_deopt_id,
|
| MethodRecognizer::Kind recognized_kind)
|
| : inputs_(inputs),
|
| locs_(NULL),
|
| @@ -2539,7 +2539,7 @@
|
| (*inputs)[i]->set_instruction(this);
|
| (*inputs)[i]->set_use_index(i);
|
| }
|
| - deopt_id_ = instance_call->deopt_id();
|
| + deopt_id_ = original_deopt_id;
|
| }
|
|
|
|
|
| @@ -2555,7 +2555,7 @@
|
| case MethodRecognizer::kDoubleRound:
|
| return 1;
|
| case MethodRecognizer::kDoubleMod:
|
| - case MethodRecognizer::kDoublePow:
|
| + case MethodRecognizer::kMathDoublePow:
|
| return 2;
|
| default:
|
| UNREACHABLE();
|
| @@ -2602,7 +2602,7 @@
|
| return kFloorRuntimeEntry;
|
| case MethodRecognizer::kDoubleCeil:
|
| return kCeilRuntimeEntry;
|
| - case MethodRecognizer::kDoublePow:
|
| + case MethodRecognizer::kMathDoublePow:
|
| return kPowRuntimeEntry;
|
| case MethodRecognizer::kDoubleMod:
|
| return kModRuntimeEntry;
|
|
|