Index: runtime/vm/intermediate_language_mips.cc |
diff --git a/runtime/vm/intermediate_language_mips.cc b/runtime/vm/intermediate_language_mips.cc |
index 7799bd9e9a0360734b4bc269c1330a373162b9aa..7342fb698f6d42b1d7d01eee8f7d4a6afed788b4 100644 |
--- a/runtime/vm/intermediate_language_mips.cc |
+++ b/runtime/vm/intermediate_language_mips.cc |
@@ -2702,19 +2702,11 @@ class CheckStackOverflowSlowPath : public SlowPathCode { |
virtual void EmitNativeCode(FlowGraphCompiler* compiler) { |
if (FLAG_use_osr && osr_entry_label()->IsLinked()) { |
- uword flags_address = Isolate::Current()->stack_overflow_flags_address(); |
Register value = instruction_->locs()->temp(0).reg(); |
__ Comment("CheckStackOverflowSlowPathOsr"); |
__ Bind(osr_entry_label()); |
- if (FLAG_allow_absolute_addresses) { |
- __ LoadImmediate(TMP, flags_address); |
- __ LoadImmediate(value, Isolate::kOsrRequest); |
- __ sw(value, Address(TMP)); |
- } else { |
- __ LoadIsolate(TMP); |
- __ LoadImmediate(value, Isolate::kOsrRequest); |
- __ sw(value, Address(TMP, Isolate::stack_overflow_flags_offset())); |
- } |
+ __ LoadImmediate(value, Thread::kOsrRequest); |
+ __ sw(value, Address(THR, Thread::stack_overflow_flags_offset())); |
} |
__ Comment("CheckStackOverflowSlowPath"); |
__ Bind(entry_label()); |
@@ -2757,13 +2749,7 @@ void CheckStackOverflowInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
CheckStackOverflowSlowPath* slow_path = new CheckStackOverflowSlowPath(this); |
compiler->AddSlowPathCode(slow_path); |
- if (compiler->is_optimizing() && FLAG_allow_absolute_addresses) { |
- __ LoadImmediate(TMP, Isolate::Current()->stack_limit_address()); |
- __ lw(CMPRES1, Address(TMP)); |
- } else { |
- __ LoadIsolate(TMP); |
- __ lw(CMPRES1, Address(TMP, Isolate::stack_limit_offset())); |
- } |
+ __ lw(CMPRES1, Address(THR, Thread::stack_limit_offset())); |
__ BranchUnsignedLessEqual(SP, CMPRES1, slow_path->entry_label()); |
if (compiler->CanOSRFunction() && in_loop()) { |
Register temp = locs()->temp(0).reg(); |