Revision: 11654
Author: [email protected]
Date: Thu May 24 06:42:58 2012
Log: Merged r11518 into 3.8 branch.
Fix unsigned-Smi check in MappedArgumentsLookup
BUG=126414
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10454007
http://code.google.com/p/v8/source/detail?r=11654
Added:
/branches/3.8/test/mjsunit/regress/regress-crbug-126414.js
Modified:
/branches/3.8/src/arm/ic-arm.cc
/branches/3.8/src/ia32/ic-ia32.cc
/branches/3.8/src/mips/ic-mips.cc
/branches/3.8/src/version.cc
=======================================
--- /dev/null
+++ /branches/3.8/test/mjsunit/regress/regress-crbug-126414.js Thu May 24
06:42:58 2012
@@ -0,0 +1,32 @@
+// Copyright 2012 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+function foo(bar) {
+ return arguments[bar];
+}
+foo(0); // Handled in runtime.
+foo(-536870912); // Triggers bug.
=======================================
--- /branches/3.8/src/arm/ic-arm.cc Wed Jan 25 23:37:54 2012
+++ /branches/3.8/src/arm/ic-arm.cc Thu May 24 06:42:58 2012
@@ -774,7 +774,7 @@
__ b(lt, slow_case);
// Check that the key is a positive smi.
- __ tst(key, Operand(0x8000001));
+ __ tst(key, Operand(0x80000001));
__ b(ne, slow_case);
// Load the elements into scratch1 and check its map.
=======================================
--- /branches/3.8/src/ia32/ic-ia32.cc Wed Jan 25 23:37:54 2012
+++ /branches/3.8/src/ia32/ic-ia32.cc Thu May 24 06:42:58 2012
@@ -383,7 +383,7 @@
__ j(below, slow_case);
// Check that the key is a positive smi.
- __ test(key, Immediate(0x8000001));
+ __ test(key, Immediate(0x80000001));
__ j(not_zero, slow_case);
// Load the elements into scratch1 and check its map.
@@ -396,7 +396,7 @@
__ mov(scratch2, FieldOperand(scratch1, FixedArray::kLengthOffset));
__ sub(scratch2, Immediate(Smi::FromInt(2)));
__ cmp(key, scratch2);
- __ j(greater_equal, unmapped_case);
+ __ j(above_equal, unmapped_case);
// Load element index and check whether it is the hole.
const int kHeaderSize = FixedArray::kHeaderSize + 2 * kPointerSize;
=======================================
--- /branches/3.8/src/mips/ic-mips.cc Wed Jan 25 23:37:54 2012
+++ /branches/3.8/src/mips/ic-mips.cc Thu May 24 06:42:58 2012
@@ -769,7 +769,7 @@
__ Branch(slow_case, lt, scratch2, Operand(FIRST_JS_RECEIVER_TYPE));
// Check that the key is a positive smi.
- __ And(scratch1, key, Operand(0x8000001));
+ __ And(scratch1, key, Operand(0x80000001));
__ Branch(slow_case, ne, scratch1, Operand(zero_reg));
// Load the elements into scratch1 and check its map.
=======================================
--- /branches/3.8/src/version.cc Mon May 21 06:43:33 2012
+++ /branches/3.8/src/version.cc Thu May 24 06:42:58 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 8
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 22
+#define PATCH_LEVEL 23
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
