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

Unified Diff: runtime/vm/intermediate_language_arm64.cc

Issue 281823002: Fix an undetected Smi overflow on ARM. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 7 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_arm.cc ('k') | 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_arm64.cc
===================================================================
--- runtime/vm/intermediate_language_arm64.cc (revision 36182)
+++ runtime/vm/intermediate_language_arm64.cc (working copy)
@@ -2608,20 +2608,28 @@
if (locs()->in(1).IsConstant()) {
const Object& constant = locs()->in(1).constant();
ASSERT(constant.IsSmi());
- int64_t imm = reinterpret_cast<int64_t>(constant.raw());
+ const int64_t imm = reinterpret_cast<int64_t>(constant.raw());
switch (op_kind()) {
- case Token::kSUB: {
- imm = -imm; // TODO(regis): What if deopt != NULL && imm == 0x80000000?
- // Fall through.
- }
case Token::kADD: {
if (deopt == NULL) {
__ AddImmediate(result, left, imm, PP);
} else {
__ AddImmediateSetFlags(result, left, imm, PP);
- __ b(deopt, VS); }
+ __ b(deopt, VS);
+ }
break;
}
+ case Token::kSUB: {
+ if (deopt == NULL) {
+ __ AddImmediate(result, left, -imm, PP);
+ } else {
+ // Negating imm and using AddImmediateSetFlags would not detect the
+ // overflow when imm == kMinInt64.
+ __ SubImmediateSetFlags(result, left, imm, PP);
+ __ b(deopt, VS);
+ }
+ break;
+ }
case Token::kMUL: {
// Keep left value tagged and untag right value.
const intptr_t value = Smi::Cast(constant).Value();
« no previous file with comments | « runtime/vm/intermediate_language_arm.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698