Index: runtime/vm/intermediate_language_arm.cc |
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc |
index c58577177de566f8371c685a506b74b358fa8d16..a12df278899df3c26fc877c0571fcf2d3f5a1b78 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, |
+ TokenDescriptor token_pos, |
intptr_t deopt_id, |
LocationSummary* locs, |
FlowGraphCompiler* compiler) { |
@@ -1834,7 +1834,7 @@ class BoxAllocationSlowPath : public SlowPathCode { |
locs->live_registers()->Remove(Location::RegisterLocation(result_)); |
compiler->SaveLiveRegisters(locs); |
- compiler->GenerateCall(Token::kNoSourcePos, // No token position. |
+ compiler->GenerateCall(TokenDescriptor::kNoSource, // No token position. |
stub_entry, |
RawPcDescriptors::kOther, |
locs); |
@@ -2905,7 +2905,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. |
+ TokenDescriptor::kNoSource); |
} |
compiler->pending_deoptimization_env_ = NULL; |
compiler->RestoreLiveRegisters(instruction_->locs()); |
@@ -6651,7 +6651,7 @@ void GotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
// may be inserted before this instruction. |
compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt, |
GetDeoptId(), |
- Token::kNoSourcePos); |
+ TokenDescriptor::kNoSource); |
} |
if (HasParallelMove()) { |
compiler->parallel_move_resolver()->EmitNativeCode(parallel_move()); |
@@ -6854,7 +6854,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(TokenDescriptor::kNoSource, |
deopt_id(), |
kGrowRegExpStackRuntimeEntry, |
1, |