| Index: runtime/vm/intermediate_language_arm.cc
|
| diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
|
| index 1473adad61a6146667a7e2c9e3339c095d56b95f..2be4d9a86e0cd21e5d2edc43cac65416938f5407 100644
|
| --- a/runtime/vm/intermediate_language_arm.cc
|
| +++ b/runtime/vm/intermediate_language_arm.cc
|
| @@ -369,7 +369,7 @@ LocationSummary* AssertBooleanInstr::MakeLocationSummary(Zone* zone,
|
|
|
|
|
| static void EmitAssertBoolean(Register reg,
|
| - intptr_t token_pos,
|
| + TokenPosition token_pos,
|
| intptr_t deopt_id,
|
| LocationSummary* locs,
|
| FlowGraphCompiler* compiler) {
|
| @@ -1826,7 +1826,7 @@ class BoxAllocationSlowPath : public SlowPathCode {
|
| locs->live_registers()->Remove(Location::RegisterLocation(result_));
|
|
|
| compiler->SaveLiveRegisters(locs);
|
| - compiler->GenerateCall(Token::kNoSourcePos, // No token position.
|
| + compiler->GenerateCall(TokenPosition::kNoSource, // No token position.
|
| stub_entry,
|
| RawPcDescriptors::kOther,
|
| locs);
|
| @@ -2897,7 +2897,7 @@ class CheckStackOverflowSlowPath : public SlowPathCode {
|
| // In unoptimized code, record loop stack checks as possible OSR entries.
|
| compiler->AddCurrentDescriptor(RawPcDescriptors::kOsrEntry,
|
| instruction_->deopt_id(),
|
| - 0); // No token position.
|
| + TokenPosition::kNoSource);
|
| }
|
| compiler->pending_deoptimization_env_ = NULL;
|
| compiler->RestoreLiveRegisters(instruction_->locs());
|
| @@ -6643,7 +6643,7 @@ void GotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| // may be inserted before this instruction.
|
| compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| GetDeoptId(),
|
| - Token::kNoSourcePos);
|
| + TokenPosition::kNoSource);
|
| }
|
| if (HasParallelMove()) {
|
| compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
|
| @@ -6846,7 +6846,7 @@ void GrowRegExpStackInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register result = locs()->out(0).reg();
|
| __ PushObject(Object::null_object());
|
| __ Push(typed_data);
|
| - compiler->GenerateRuntimeCall(Token::kNoSourcePos, // No token position.
|
| + compiler->GenerateRuntimeCall(TokenPosition::kNoSource,
|
| deopt_id(),
|
| kGrowRegExpStackRuntimeEntry,
|
| 1,
|
|
|