| Index: runtime/vm/flow_graph_compiler.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler.cc (revision 35455)
|
| +++ runtime/vm/flow_graph_compiler.cc (working copy)
|
| @@ -476,7 +476,7 @@
|
| ASSERT(is_optimizing());
|
| CompilerDeoptInfo* info =
|
| new CompilerDeoptInfo(deopt_id,
|
| - kDeoptAtCall,
|
| + ICData::kDeoptAtCall,
|
| pending_deoptimization_env_);
|
| info->set_pc_offset(assembler()->CodeSize());
|
| deopt_infos_.Add(info);
|
| @@ -633,7 +633,7 @@
|
|
|
|
|
| Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
|
| - DeoptReasonId reason) {
|
| + ICData::DeoptReasonId reason) {
|
| ASSERT(is_optimizing_);
|
| CompilerDeoptInfoWithStub* stub =
|
| new CompilerDeoptInfoWithStub(deopt_id,
|
| @@ -772,7 +772,7 @@
|
| ASSERT(FLAG_propagate_ic_data || (ic_data.NumberOfChecks() == 0));
|
| uword label_address = 0;
|
| if (is_optimizing() && (ic_data.NumberOfChecks() == 0)) {
|
| - if (ic_data.is_closure_call()) {
|
| + if (ic_data.IsClosureCall()) {
|
| // This IC call may be closure call only.
|
| label_address = StubCode::ClosureCallInlineCacheEntryPoint();
|
| ExternalLabel target_label("InlineCache", label_address);
|
| @@ -786,7 +786,7 @@
|
| ASSERT(!is_optimizing()
|
| || may_reoptimize()
|
| || flow_graph().IsCompiledForOsr());
|
| - switch (ic_data.num_args_tested()) {
|
| + switch (ic_data.NumArgsTested()) {
|
| case 1:
|
| label_address = StubCode::OneArgOptimizedCheckInlineCacheEntryPoint();
|
| break;
|
| @@ -812,7 +812,7 @@
|
| return;
|
| }
|
|
|
| - switch (ic_data.num_args_tested()) {
|
| + switch (ic_data.NumArgsTested()) {
|
| case 1:
|
| label_address = StubCode::OneArgCheckInlineCacheEntryPoint();
|
| break;
|
| @@ -1289,7 +1289,7 @@
|
| // The expected number of elements to sort is less than 10.
|
| void FlowGraphCompiler::SortICDataByCount(const ICData& ic_data,
|
| GrowableArray<CidTarget>* sorted) {
|
| - ASSERT(ic_data.num_args_tested() == 1);
|
| + ASSERT(ic_data.NumArgsTested() == 1);
|
| const intptr_t len = ic_data.NumberOfChecks();
|
| sorted->Clear();
|
|
|
|
|