| Index: runtime/vm/intermediate_language_ia32.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_ia32.cc (revision 38030)
|
| +++ runtime/vm/intermediate_language_ia32.cc (working copy)
|
| @@ -817,7 +817,7 @@
|
| &StubCode::CallNativeCFunctionLabel();
|
| compiler->GenerateCall(token_pos(),
|
| stub_entry,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs());
|
| __ popl(result);
|
| }
|
| @@ -1718,7 +1718,7 @@
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(Scanner::kNoSourcePos, // No token position.
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| __ MoveRegister(locs->temp(0).reg(), EAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -2185,7 +2185,7 @@
|
| __ Bind(&slow_path);
|
| compiler->GenerateCall(token_pos(),
|
| &StubCode::AllocateArrayLabel(),
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs());
|
| __ Bind(&done);
|
| ASSERT(locs()->out(0).reg() == kResultReg);
|
| @@ -2211,7 +2211,7 @@
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(Scanner::kNoSourcePos, // No token position.
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| __ MoveRegister(locs->out(0).reg(), EAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -2243,7 +2243,7 @@
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(Scanner::kNoSourcePos, // No token position.
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| __ MoveRegister(locs->out(0).reg(), EAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -2275,7 +2275,7 @@
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(Scanner::kNoSourcePos, // No token position.
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| __ MoveRegister(locs->out(0).reg(), EAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -2581,7 +2581,7 @@
|
| const ExternalLabel label(StubCode::AllocateContextEntryPoint());
|
| compiler->GenerateCall(instruction_->token_pos(),
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| ASSERT(instruction_->locs()->out(0).reg() == EAX);
|
| compiler->RestoreLiveRegisters(instruction_->locs());
|
| @@ -2671,7 +2671,7 @@
|
| const ExternalLabel label(StubCode::AllocateContextEntryPoint());
|
| compiler->GenerateCall(token_pos(),
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs());
|
| }
|
|
|
| @@ -2779,7 +2779,7 @@
|
|
|
| if (FLAG_use_osr && !compiler->is_optimizing() && instruction_->in_loop()) {
|
| // In unoptimized code, record loop stack checks as possible OSR entries.
|
| - compiler->AddCurrentDescriptor(PcDescriptors::kOsrEntry,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kOsrEntry,
|
| instruction_->deopt_id(),
|
| 0); // No token position.
|
| }
|
| @@ -3618,7 +3618,7 @@
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(Scanner::kNoSourcePos, // No token position.
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| __ MoveRegister(locs->out(0).reg(), EAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -5700,7 +5700,7 @@
|
| compiler->SaveLiveRegisters(locs);
|
| compiler->GenerateCall(Scanner::kNoSourcePos, // No token position.
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs);
|
| __ MoveRegister(locs->out(0).reg(), EAX);
|
| compiler->RestoreLiveRegisters(locs);
|
| @@ -6035,7 +6035,7 @@
|
| // The deoptimization descriptor points after the edge counter code for
|
| // uniformity with ARM and MIPS, where we can reuse pattern matching
|
| // code that matches backwards from the end of the pattern.
|
| - compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| deopt_id_,
|
| Scanner::kNoSourcePos);
|
| }
|
| @@ -6061,7 +6061,7 @@
|
| // after the edge counter for uniformity with ARM and MIPS, where we can
|
| // reuse pattern matching that matches backwards from the end of the
|
| // pattern.
|
| - compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| GetDeoptId(),
|
| Scanner::kNoSourcePos);
|
| }
|
| @@ -6266,7 +6266,7 @@
|
| __ xorl(ECX, ECX);
|
| __ addl(EBX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
|
| __ call(EBX);
|
| - compiler->AddCurrentDescriptor(PcDescriptors::kClosureCall,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kClosureCall,
|
| deopt_id(),
|
| token_pos());
|
| compiler->RecordSafepoint(locs());
|
| @@ -6278,7 +6278,7 @@
|
| } else {
|
| // Add deoptimization continuation point after the call and before the
|
| // arguments are removed.
|
| - compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
|
| + compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| deopt_id_after,
|
| token_pos());
|
| }
|
| @@ -6319,7 +6319,7 @@
|
| const ExternalLabel label(stub.EntryPoint());
|
| compiler->GenerateCall(token_pos(),
|
| &label,
|
| - PcDescriptors::kOther,
|
| + RawPcDescriptors::kOther,
|
| locs());
|
| __ Drop(ArgumentCount()); // Discard arguments.
|
| }
|
|
|