| Index: runtime/vm/flow_graph_compiler_arm64.cc
|
| diff --git a/runtime/vm/flow_graph_compiler_arm64.cc b/runtime/vm/flow_graph_compiler_arm64.cc
|
| index 952a30bfe1e9de8060a686c7fd5cfcc69d2816b9..2c9a717faf324989f2057138a1f9ffc029cf8add 100644
|
| --- a/runtime/vm/flow_graph_compiler_arm64.cc
|
| +++ b/runtime/vm/flow_graph_compiler_arm64.cc
|
| @@ -126,7 +126,7 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
|
| // which is recorded in the outer environment.
|
| builder->AddReturnAddress(
|
| current->function(),
|
| - Isolate::ToDeoptAfter(current->deopt_id()),
|
| + Thread::ToDeoptAfter(current->deopt_id()),
|
| slot_ix++);
|
|
|
| // The values of outgoing arguments can be changed from the inlined call so
|
| @@ -1135,7 +1135,7 @@ void FlowGraphCompiler::GenerateCall(intptr_t token_pos,
|
| RawPcDescriptors::Kind kind,
|
| LocationSummary* locs) {
|
| __ BranchLinkPatchable(stub_entry);
|
| - AddCurrentDescriptor(kind, Isolate::kNoDeoptId, token_pos);
|
| + AddCurrentDescriptor(kind, Thread::kNoDeoptId, token_pos);
|
| RecordSafepoint(locs);
|
| }
|
|
|
| @@ -1150,7 +1150,7 @@ void FlowGraphCompiler::GenerateDartCall(intptr_t deopt_id,
|
| RecordSafepoint(locs);
|
| // Marks either the continuation point in unoptimized code or the
|
| // deoptimization point in optimized code, after call.
|
| - const intptr_t deopt_id_after = Isolate::ToDeoptAfter(deopt_id);
|
| + const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id);
|
| if (is_optimizing()) {
|
| AddDeoptIndexAtCall(deopt_id_after, token_pos);
|
| } else {
|
| @@ -1169,10 +1169,10 @@ void FlowGraphCompiler::GenerateRuntimeCall(intptr_t token_pos,
|
| __ CallRuntime(entry, argument_count);
|
| AddCurrentDescriptor(RawPcDescriptors::kOther, deopt_id, token_pos);
|
| RecordSafepoint(locs);
|
| - if (deopt_id != Isolate::kNoDeoptId) {
|
| + if (deopt_id != Thread::kNoDeoptId) {
|
| // Marks either the continuation point in unoptimized code or the
|
| // deoptimization point in optimized code, after call.
|
| - const intptr_t deopt_id_after = Isolate::ToDeoptAfter(deopt_id);
|
| + const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id);
|
| if (is_optimizing()) {
|
| AddDeoptIndexAtCall(deopt_id_after, token_pos);
|
| } else {
|
| @@ -1270,9 +1270,9 @@ void FlowGraphCompiler::EmitMegamorphicInstanceCall(
|
| __ LoadObject(R4, arguments_descriptor);
|
| __ blr(targetR);
|
| AddCurrentDescriptor(RawPcDescriptors::kOther,
|
| - Isolate::kNoDeoptId, token_pos);
|
| + Thread::kNoDeoptId, token_pos);
|
| RecordSafepoint(locs);
|
| - const intptr_t deopt_id_after = Isolate::ToDeoptAfter(deopt_id);
|
| + const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id);
|
| if (is_optimizing()) {
|
| AddDeoptIndexAtCall(deopt_id_after, token_pos);
|
| } else {
|
| @@ -1340,7 +1340,7 @@ Condition FlowGraphCompiler::EmitEqualityRegConstCompare(
|
| }
|
| if (token_pos != Scanner::kNoSourcePos) {
|
| AddCurrentDescriptor(RawPcDescriptors::kRuntimeCall,
|
| - Isolate::kNoDeoptId,
|
| + Thread::kNoDeoptId,
|
| token_pos);
|
| }
|
| // Stub returns result in flags (result of a cmp, we need Z computed).
|
| @@ -1369,7 +1369,7 @@ Condition FlowGraphCompiler::EmitEqualityRegRegCompare(Register left,
|
| }
|
| if (token_pos != Scanner::kNoSourcePos) {
|
| AddCurrentDescriptor(RawPcDescriptors::kRuntimeCall,
|
| - Isolate::kNoDeoptId,
|
| + Thread::kNoDeoptId,
|
| token_pos);
|
| }
|
| // Stub returns result in flags (result of a cmp, we need Z computed).
|
|
|