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

Unified Diff: lib/compiler/implementation/lib/js_helper.dart

Issue 10332291: Negative numbers should not be >>> shifted. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix bad English. Created 8 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 | « no previous file | tests/language/positive_bit_operations_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/lib/js_helper.dart
diff --git a/lib/compiler/implementation/lib/js_helper.dart b/lib/compiler/implementation/lib/js_helper.dart
index c46f2f42b49b0d96f54c624576d92c45da2c46ba..bfcce23f4622b113765916cc5325014aa8ee008e 100644
--- a/lib/compiler/implementation/lib/js_helper.dart
+++ b/lib/compiler/implementation/lib/js_helper.dart
@@ -175,10 +175,21 @@ shr(var a, var b) {
// TODO(floitsch): inputs must be integers.
if (checkNumbers(a, b)) {
if (b < 0) throw new IllegalArgumentException(b);
- // JavaScript only looks at the last 5 bits of the shift-amount. Shifting
- // by 33 is hence equivalent to a shift by 1.
- if (b > 31) return 0;
- return JS('num', @'# >>> #', a, b);
+ if (a > 0) {
+ // JavaScript only looks at the last 5 bits of the shift-amount. In JS
+ // shifting by 33 is hence equivalent to a shift by 1. Shortcut the
+ // computation when that happens.
+ if (b > 31) return 0;
+ // Given that 'a' is positive we must not use '>>'. Otherwise a number
+ // that has the 31st bit set would be treated as negative and shift in
+ // ones.
+ return JS('num', @'# >>> #', a, b);
+ }
+ // For negative numbers we just clamp the shift-by amount. 'a' could be
+ // negative but not have its 31st bit set. The ">>" would then shift in
+ // 0s instead of 1s. Therefore we cannot simply return 0xFFFFFFFF.
+ if (b > 31) b = 31;
+ return JS('num', @'(# >> #) >>> 0', a, b);
}
return UNINTERCEPTED(a >> b);
}
« no previous file with comments | « no previous file | tests/language/positive_bit_operations_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698