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

Unified Diff: runtime/vm/intrinsifier_mips.cc

Issue 1248113003: VM: Fix more places with isolate embedded into unoptimized code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: minor cleanup in stub_code* Created 5 years, 5 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/intrinsifier_mips.cc
diff --git a/runtime/vm/intrinsifier_mips.cc b/runtime/vm/intrinsifier_mips.cc
index 1cbb12f5bca1a6cd8148f292a4c1929b23adcfe3..71f0ab653088208c0c216eceab9c1edd4c532795 100644
--- a/runtime/vm/intrinsifier_mips.cc
+++ b/runtime/vm/intrinsifier_mips.cc
@@ -2137,8 +2137,7 @@ void Intrinsifier::JSRegExp_ExecuteMatch(Assembler* assembler) {
// On stack: user tag (+0).
void Intrinsifier::UserTag_makeCurrent(Assembler* assembler) {
// T1: Isolate.
- Isolate* isolate = Isolate::Current();
- __ LoadImmediate(T1, reinterpret_cast<uword>(isolate));
+ __ LoadIsolate(T1);
// V0: Current user tag.
__ lw(V0, Address(T1, Isolate::current_tag_offset()));
// T2: UserTag.
@@ -2155,20 +2154,14 @@ void Intrinsifier::UserTag_makeCurrent(Assembler* assembler) {
void Intrinsifier::UserTag_defaultTag(Assembler* assembler) {
- Isolate* isolate = Isolate::Current();
- // V0: Address of default tag.
- __ LoadImmediate(V0,
- reinterpret_cast<uword>(isolate) + Isolate::default_tag_offset());
+ __ LoadIsolate(V0);
__ Ret();
- __ delay_slot()->lw(V0, Address(V0, 0));
+ __ delay_slot()->lw(V0, Address(V0, Isolate::default_tag_offset()));
}
void Intrinsifier::Profiler_getCurrentTag(Assembler* assembler) {
- // V0: Isolate.
- Isolate* isolate = Isolate::Current();
- __ LoadImmediate(V0, reinterpret_cast<uword>(isolate));
- // Set return value.
+ __ LoadIsolate(V0);
__ Ret();
__ delay_slot()->lw(V0, Address(V0, Isolate::current_tag_offset()));
}

Powered by Google App Engine
This is Rietveld 408576698