| Index: runtime/vm/stub_code_ia32.cc
|
| diff --git a/runtime/vm/stub_code_ia32.cc b/runtime/vm/stub_code_ia32.cc
|
| index 6da8c44a6b439f2ab33da733a3dfe88789919898..ce309fb6e0a87d4d73817d0e6584ba56d5c7d927 100644
|
| --- a/runtime/vm/stub_code_ia32.cc
|
| +++ b/runtime/vm/stub_code_ia32.cc
|
| @@ -1344,9 +1344,8 @@ void StubCode::GenerateNArgsCheckInlineCacheStub(
|
| Label stepping, done_stepping;
|
| if (FLAG_support_debugger && !optimized) {
|
| __ Comment("Check single stepping");
|
| - uword single_step_address = reinterpret_cast<uword>(Isolate::Current()) +
|
| - Isolate::single_step_offset();
|
| - __ cmpb(Address::Absolute(single_step_address), Immediate(0));
|
| + __ LoadIsolate(EAX);
|
| + __ cmpb(Address(EAX, Isolate::single_step_offset()), Immediate(0));
|
| __ j(NOT_EQUAL, &stepping);
|
| __ Bind(&done_stepping);
|
| }
|
| @@ -1646,9 +1645,8 @@ void StubCode::GenerateZeroArgsUnoptimizedStaticCallStub(Assembler* assembler) {
|
| // Check single stepping.
|
| Label stepping, done_stepping;
|
| if (FLAG_support_debugger) {
|
| - uword single_step_address = reinterpret_cast<uword>(Isolate::Current()) +
|
| - Isolate::single_step_offset();
|
| - __ cmpb(Address::Absolute(single_step_address), Immediate(0));
|
| + __ LoadIsolate(EAX);
|
| + __ cmpb(Address(EAX, Isolate::single_step_offset()), Immediate(0));
|
| __ j(NOT_EQUAL, &stepping, Assembler::kNearJump);
|
| __ Bind(&done_stepping);
|
| }
|
|
|