Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3879)

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 1679363002: Tests that --fields_may_be_reset, --link_natives_lazily, and --no_allow_absolute_addresses work in … (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index a86906adeb1865d69aed1b6941a5c5b94c76ae85..3c810461c0b6ace7e11d6a22cac841872e23c9b3 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -2883,10 +2883,15 @@ class CheckStackOverflowSlowPath : public SlowPathCode {
const Register value = instruction_->locs()->temp(0).reg();
__ Comment("CheckStackOverflowSlowPathOsr");
__ Bind(osr_entry_label());
- ASSERT(FLAG_allow_absolute_addresses);
- __ LoadImmediate(IP, flags_address);
- __ LoadImmediate(value, Isolate::kOsrRequest);
- __ str(value, Address(IP));
+ if (FLAG_allow_absolute_addresses) {
+ __ LoadImmediate(IP, flags_address);
+ __ LoadImmediate(value, Isolate::kOsrRequest);
+ __ str(value, Address(IP));
+ } else {
+ __ LoadIsolate(IP);
+ __ LoadImmediate(value, Isolate::kOsrRequest);
+ __ str(value, Address(IP, Isolate::stack_overflow_flags_offset()));
+ }
}
__ Comment("CheckStackOverflowSlowPath");
__ Bind(entry_label());
« no previous file with comments | « no previous file | runtime/vm/intermediate_language_arm64.cc » ('j') | tests/standalone/no_lazy_dispatchers_test.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698