Index: runtime/vm/flow_graph_compiler_arm64.cc |
=================================================================== |
--- runtime/vm/flow_graph_compiler_arm64.cc (revision 38030) |
+++ runtime/vm/flow_graph_compiler_arm64.cc (working copy) |
@@ -1114,7 +1114,7 @@ |
void FlowGraphCompiler::GenerateCall(intptr_t token_pos, |
const ExternalLabel* label, |
- PcDescriptors::Kind kind, |
+ RawPcDescriptors::Kind kind, |
LocationSummary* locs) { |
__ BranchLinkPatchable(label); |
AddCurrentDescriptor(kind, Isolate::kNoDeoptId, token_pos); |
@@ -1125,7 +1125,7 @@ |
void FlowGraphCompiler::GenerateDartCall(intptr_t deopt_id, |
intptr_t token_pos, |
const ExternalLabel* label, |
- PcDescriptors::Kind kind, |
+ RawPcDescriptors::Kind kind, |
LocationSummary* locs) { |
__ BranchLinkPatchable(label); |
AddCurrentDescriptor(kind, deopt_id, token_pos); |
@@ -1138,7 +1138,7 @@ |
} else { |
// Add deoptimization continuation point after the call and before the |
// arguments are removed. |
- AddCurrentDescriptor(PcDescriptors::kDeopt, deopt_id_after, token_pos); |
+ AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after, token_pos); |
} |
} |
@@ -1149,7 +1149,7 @@ |
intptr_t argument_count, |
LocationSummary* locs) { |
__ CallRuntime(entry, argument_count); |
- AddCurrentDescriptor(PcDescriptors::kOther, deopt_id, token_pos); |
+ AddCurrentDescriptor(RawPcDescriptors::kOther, deopt_id, token_pos); |
RecordSafepoint(locs); |
if (deopt_id != Isolate::kNoDeoptId) { |
// Marks either the continuation point in unoptimized code or the |
@@ -1160,7 +1160,7 @@ |
} else { |
// Add deoptimization continuation point after the call and before the |
// arguments are removed. |
- AddCurrentDescriptor(PcDescriptors::kDeopt, deopt_id_after, token_pos); |
+ AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after, token_pos); |
} |
} |
} |
@@ -1202,7 +1202,7 @@ |
GenerateDartCall(deopt_id, |
token_pos, |
target_label, |
- PcDescriptors::kIcCall, |
+ RawPcDescriptors::kIcCall, |
locs); |
__ Drop(argument_count); |
} |
@@ -1220,7 +1220,7 @@ |
GenerateDartCall(deopt_id, |
token_pos, |
target_label, |
- PcDescriptors::kIcCall, |
+ RawPcDescriptors::kIcCall, |
locs); |
__ Drop(argument_count); |
#if defined(DEBUG) |
@@ -1283,7 +1283,8 @@ |
__ LoadObject(R4, arguments_descriptor, PP); |
__ AddImmediate(R1, R1, Instructions::HeaderSize() - kHeapObjectTag, PP); |
__ blr(R1); |
- AddCurrentDescriptor(PcDescriptors::kOther, Isolate::kNoDeoptId, token_pos); |
+ AddCurrentDescriptor(RawPcDescriptors::kOther, |
+ Isolate::kNoDeoptId, token_pos); |
RecordSafepoint(locs); |
AddDeoptIndexAtCall(Isolate::ToDeoptAfter(deopt_id), token_pos); |
__ Drop(argument_count); |
@@ -1310,7 +1311,7 @@ |
GenerateDartCall(deopt_id, |
token_pos, |
&target_label, |
- PcDescriptors::kUnoptStaticCall, |
+ RawPcDescriptors::kUnoptStaticCall, |
locs); |
#if defined(DEBUG) |
__ LoadImmediate(R5, kInvalidObjectPointer, kNoPP); |
@@ -1332,7 +1333,7 @@ |
GenerateDartCall(deopt_id, |
token_pos, |
&StubCode::CallStaticFunctionLabel(), |
- PcDescriptors::kOptStaticCall, |
+ RawPcDescriptors::kOptStaticCall, |
locs); |
AddStaticCallTarget(function); |
__ Drop(argument_count); |
@@ -1355,7 +1356,7 @@ |
&StubCode::UnoptimizedIdenticalWithNumberCheckLabel()); |
} |
if (token_pos != Scanner::kNoSourcePos) { |
- AddCurrentDescriptor(PcDescriptors::kRuntimeCall, |
+ AddCurrentDescriptor(RawPcDescriptors::kRuntimeCall, |
Isolate::kNoDeoptId, |
token_pos); |
} |
@@ -1385,7 +1386,7 @@ |
&StubCode::UnoptimizedIdenticalWithNumberCheckLabel()); |
} |
if (token_pos != Scanner::kNoSourcePos) { |
- AddCurrentDescriptor(PcDescriptors::kRuntimeCall, |
+ AddCurrentDescriptor(RawPcDescriptors::kRuntimeCall, |
Isolate::kNoDeoptId, |
token_pos); |
} |
@@ -1490,7 +1491,7 @@ |
GenerateDartCall(deopt_id, |
token_index, |
&StubCode::CallStaticFunctionLabel(), |
- PcDescriptors::kOptStaticCall, |
+ RawPcDescriptors::kOptStaticCall, |
locs); |
const Function& function = *sorted[i].target; |
AddStaticCallTarget(function); |