Index: runtime/vm/intermediate_language_arm.cc |
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc |
index f3a39c19d29740641be972bd1c940763d5fa0e75..2577008101209aaf4e92bd52e89fed8620a8922c 100644 |
--- a/runtime/vm/intermediate_language_arm.cc |
+++ b/runtime/vm/intermediate_language_arm.cc |
@@ -3139,8 +3139,12 @@ class CheckedSmiSlowPath : public SlowPathCode { |
} |
__ Push(locs->in(0).reg()); |
__ Push(locs->in(1).reg()); |
+ String& selector = |
+ String::Handle(instruction_->call()->ic_data()->target_name()); |
+ Array& argument_names = |
+ Array::Handle(instruction_->call()->ic_data()->arguments_descriptor()); |
compiler->EmitMegamorphicInstanceCall( |
- *instruction_->call()->ic_data(), instruction_->call()->ArgumentCount(), |
+ selector, argument_names, instruction_->call()->ArgumentCount(), |
instruction_->call()->deopt_id(), instruction_->call()->token_pos(), |
locs, try_index_, |
/* slow_path_argument_count = */ 2); |
@@ -3278,8 +3282,12 @@ class CheckedSmiComparisonSlowPath : public SlowPathCode { |
} |
__ Push(locs->in(0).reg()); |
__ Push(locs->in(1).reg()); |
+ String& selector = |
Vyacheslav Egorov (Google)
2017/04/10 10:59:28
const String&
erikcorry
2017/04/19 15:06:40
Done.
|
+ String::Handle(instruction_->call()->ic_data()->target_name()); |
+ Array& argument_names = |
Vyacheslav Egorov (Google)
2017/04/10 10:59:28
const Array&
erikcorry
2017/04/19 15:06:40
Done.
|
+ Array::Handle(instruction_->call()->ic_data()->arguments_descriptor()); |
compiler->EmitMegamorphicInstanceCall( |
- *instruction_->call()->ic_data(), instruction_->call()->ArgumentCount(), |
+ selector, argument_names, instruction_->call()->ArgumentCount(), |
instruction_->call()->deopt_id(), instruction_->call()->token_pos(), |
locs, try_index_, |
/* slow_path_argument_count = */ 2); |
@@ -6319,7 +6327,7 @@ void CheckClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Register biased_cid = temp; |
__ LoadClassId(biased_cid, value); |
- GrowableArray<CidRangeTarget> sorted_ic_data; |
+ ZoneGrowableArray<CidRangeTarget> sorted_ic_data; |
FlowGraphCompiler::SortICDataByCount(unary_checks(), &sorted_ic_data, |
/* drop_smi = */ true); |