Index: runtime/vm/intermediate_language_ia32.cc |
=================================================================== |
--- runtime/vm/intermediate_language_ia32.cc (revision 31428) |
+++ runtime/vm/intermediate_language_ia32.cc (working copy) |
@@ -98,13 +98,6 @@ |
#endif |
__ LeaveFrame(); |
__ ret(); |
- |
- // Generate 1 byte NOP so that the debugger can patch the |
- // return pattern with a call to the debug stub. |
- __ nop(1); |
- compiler->AddCurrentDescriptor(PcDescriptors::kReturn, |
- Isolate::kNoDeoptId, |
- token_pos()); |
} |
@@ -708,6 +701,34 @@ |
} |
+LocationSummary* DebugStepCheckInstr::MakeLocationSummary(bool opt) const { |
+ const intptr_t kNumInputs = 0; |
+ const intptr_t kNumTemps = 0; |
+ LocationSummary* locs = |
+ new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall); |
+ return locs; |
+} |
+ |
+ |
+void DebugStepCheckInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
+ if (!compiler->is_optimizing()) { |
+ const ExternalLabel label("debug_step_check", |
+ StubCode::DebugStepCheckEntryPoint()); |
+ compiler->GenerateCall(token_pos(), |
+ &label, |
+ PcDescriptors::kReturn, |
+ locs()); |
+ } |
+} |
+ |
+ |
+Instruction* DebugStepCheckInstr::Canonicalize(FlowGraph* flow_graph) { |
+ if (compiler->is_optimizing()) { |
+ return NULL; |
+ } |
+} |
+ |
+ |
static bool CanBeImmediateIndex(Value* value, intptr_t cid) { |
ConstantInstr* constant = value->definition()->AsConstant(); |
if ((constant == NULL) || !Assembler::IsSafeSmi(constant->value())) { |