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

Unified Diff: runtime/vm/intermediate_language_mips.cc

Issue 264953004: For nullable/double typed fields compare with null for deoptimization, else assume double. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 8 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
« no previous file with comments | « runtime/vm/intermediate_language_ia32.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_mips.cc
===================================================================
--- runtime/vm/intermediate_language_mips.cc (revision 35689)
+++ runtime/vm/intermediate_language_mips.cc (working copy)
@@ -3042,7 +3042,8 @@
void UnboxDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- const intptr_t value_cid = value()->Type()->ToCid();
+ CompileType* value_type = value()->Type();
+ const intptr_t value_cid = value_type->ToCid();
const Register value = locs()->in(0).reg();
const DRegister result = locs()->out(0).fpu_reg();
@@ -3055,20 +3056,29 @@
} else {
Label* deopt = compiler->AddDeoptStub(deopt_id_,
ICData::kDeoptBinaryDoubleOp);
- Label is_smi, done;
+ if (value_type->is_nullable() &&
+ (value_type->ToNullableCid() == kDoubleCid)) {
+ __ BranchEqual(value, reinterpret_cast<int32_t>(Object::null()), deopt);
+ // It must be double now.
+ __ LoadDFromOffset(result, value,
+ Double::value_offset() - kHeapObjectTag);
+ } else {
+ Label is_smi, done;
- __ andi(CMPRES1, value, Immediate(kSmiTagMask));
- __ beq(CMPRES1, ZR, &is_smi);
- __ LoadClassId(CMPRES1, value);
- __ BranchNotEqual(CMPRES1, kDoubleCid, deopt);
- __ LoadDFromOffset(result, value, Double::value_offset() - kHeapObjectTag);
- __ b(&done);
- __ Bind(&is_smi);
- // TODO(regis): Why do we preserve value here but not above?
- __ sra(TMP, value, 1);
- __ mtc1(TMP, STMP1);
- __ cvtdw(result, STMP1);
- __ Bind(&done);
+ __ andi(CMPRES1, value, Immediate(kSmiTagMask));
+ __ beq(CMPRES1, ZR, &is_smi);
+ __ LoadClassId(CMPRES1, value);
+ __ BranchNotEqual(CMPRES1, kDoubleCid, deopt);
+ __ LoadDFromOffset(result, value,
+ Double::value_offset() - kHeapObjectTag);
+ __ b(&done);
+ __ Bind(&is_smi);
+ // TODO(regis): Why do we preserve value here but not above?
+ __ sra(TMP, value, 1);
+ __ mtc1(TMP, STMP1);
+ __ cvtdw(result, STMP1);
+ __ Bind(&done);
+ }
}
}
« no previous file with comments | « runtime/vm/intermediate_language_ia32.cc ('k') | runtime/vm/intermediate_language_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698