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

Unified Diff: runtime/vm/intermediate_language_arm.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 | « no previous file | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_arm.cc
===================================================================
--- runtime/vm/intermediate_language_arm.cc (revision 35689)
+++ runtime/vm/intermediate_language_arm.cc (working copy)
@@ -3311,7 +3311,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 = EvenDRegisterOf(locs()->out(0).fpu_reg());
@@ -3325,19 +3326,29 @@
Label* deopt = compiler->AddDeoptStub(deopt_id_,
ICData::kDeoptBinaryDoubleOp);
Register temp = locs()->temp(0).reg();
- Label is_smi, done;
- __ tst(value, ShifterOperand(kSmiTagMask));
- __ b(&is_smi, EQ);
- __ CompareClassId(value, kDoubleCid, temp);
- __ b(deopt, NE);
- __ LoadDFromOffset(result, value, Double::value_offset() - kHeapObjectTag);
- __ b(&done);
- __ Bind(&is_smi);
- // TODO(regis): Why do we preserve value here but not above?
- __ mov(IP, ShifterOperand(value, ASR, 1)); // Copy and untag.
- __ vmovsr(STMP, IP);
- __ vcvtdi(result, STMP);
- __ Bind(&done);
+ if (value_type->is_nullable() &&
+ (value_type->ToNullableCid() == kDoubleCid)) {
+ __ CompareImmediate(value, reinterpret_cast<intptr_t>(Object::null()));
+ __ b(deopt, EQ);
+ // It must be double now.
+ __ LoadDFromOffset(result, value,
+ Double::value_offset() - kHeapObjectTag);
+ } else {
+ Label is_smi, done;
+ __ tst(value, ShifterOperand(kSmiTagMask));
+ __ b(&is_smi, EQ);
+ __ CompareClassId(value, kDoubleCid, temp);
+ __ b(deopt, NE);
+ __ LoadDFromOffset(result, value,
+ Double::value_offset() - kHeapObjectTag);
+ __ b(&done);
+ __ Bind(&is_smi);
+ // TODO(regis): Why do we preserve value here but not above?
+ __ mov(IP, ShifterOperand(value, ASR, 1)); // Copy and untag.
+ __ vmovsr(STMP, IP);
+ __ vcvtdi(result, STMP);
+ __ Bind(&done);
+ }
}
}
« no previous file with comments | « no previous file | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698