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

Unified Diff: runtime/vm/intermediate_language_x64.cc

Issue 10883063: Add explicit smi checks for unary smi operations. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 4 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') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_x64.cc
===================================================================
--- runtime/vm/intermediate_language_x64.cc (revision 11386)
+++ runtime/vm/intermediate_language_x64.cc (working copy)
@@ -1972,38 +1972,23 @@
void UnarySmiOpComp::EmitNativeCode(FlowGraphCompiler* compiler) {
- const ICData& ic_data = *instance_call()->ic_data();
- ASSERT(!ic_data.IsNull());
- ASSERT(ic_data.num_args_tested() == 1);
- // TODO(srdjan): Implement for more checks.
- ASSERT(ic_data.NumberOfChecks() == 1);
- intptr_t test_class_id;
- Function& target = Function::Handle();
- ic_data.GetOneClassCheckAt(0, &test_class_id, &target);
-
Register value = locs()->in(0).reg();
- Register result = locs()->out().reg();
- ASSERT(value == result);
- Label* deopt = compiler->AddDeoptStub(instance_call()->deopt_id(),
- instance_call()->try_index(),
- kDeoptUnaryOp);
- if (test_class_id == kSmiCid) {
- __ testq(value, Immediate(kSmiTagMask));
- __ j(NOT_ZERO, deopt);
- switch (op_kind()) {
- case Token::kNEGATE:
- __ negq(value);
- __ j(OVERFLOW, deopt);
- break;
- case Token::kBIT_NOT:
- __ notq(value);
- __ andq(value, Immediate(~kSmiTagMask)); // Remove inverted smi-tag.
- break;
- default:
- UNREACHABLE();
+ ASSERT(value == locs()->out().reg());
+ switch (op_kind()) {
+ case Token::kNEGATE: {
+ Label* deopt = compiler->AddDeoptStub(instance_call()->deopt_id(),
+ instance_call()->try_index(),
+ kDeoptUnaryOp);
+ __ negq(value);
+ __ j(OVERFLOW, deopt);
+ break;
}
- } else {
- UNREACHABLE();
+ case Token::kBIT_NOT:
+ __ notq(value);
+ __ andq(value, Immediate(~kSmiTagMask)); // Remove inverted smi-tag.
+ break;
+ default:
+ UNREACHABLE();
}
}
« no previous file with comments | « runtime/vm/intermediate_language_ia32.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698