Revision: 11360
Author: [email protected]
Date: Tue Apr 17 09:09:59 2012
Log: Merged r11286 into 3.9 branch.
Fix regular and ElementsKind transitions interfering with each other
BUG=122271
[email protected]
Review URL: https://chromiumcodereview.appspot.com/9969211
http://code.google.com/p/v8/source/detail?r=11360
Added:
/branches/3.9/test/mjsunit/regress/regress-crbug-122271.js
Modified:
/branches/3.9/src/arm/stub-cache-arm.cc
/branches/3.9/src/ia32/stub-cache-ia32.cc
/branches/3.9/src/mips/stub-cache-mips.cc
/branches/3.9/src/version.cc
/branches/3.9/src/x64/stub-cache-x64.cc
=======================================
--- /dev/null
+++ /branches/3.9/test/mjsunit/regress/regress-crbug-122271.js Tue Apr 17
09:09:59 2012
@@ -0,0 +1,49 @@
+// 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.
+
+// Flags: --allow-natives-syntax
+
+// Tests that ElementsKind transitions and regular transitions don't
+// interfere badly with each other.
+
+var a = [0, 0, 0, 1];
+var b = [0, 0, 0, "one"];
+var c = [0, 0, 0, 1];
+c.foo = "baz";
+
+function foo(array) {
+ array.foo = "bar";
+}
+
+assertTrue(%HasFastSmiOnlyElements(a));
+assertTrue(%HasFastElements(b));
+
+foo(a);
+foo(b);
+
+assertTrue(%HasFastSmiOnlyElements(a));
+assertTrue(%HasFastElements(b));
=======================================
--- /branches/3.9/src/arm/stub-cache-arm.cc Wed Mar 14 04:16:03 2012
+++ /branches/3.9/src/arm/stub-cache-arm.cc Tue Apr 17 09:09:59 2012
@@ -443,8 +443,10 @@
Label exit;
// Check that the map of the object hasn't changed.
+ CompareMapMode mode = transition.is_null() ?
ALLOW_ELEMENT_TRANSITION_MAPS
+ : REQUIRE_EXACT_MAP;
__ CheckMap(receiver_reg, scratch, Handle<Map>(object->map()),
miss_label,
- DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS);
+ DO_SMI_CHECK, mode);
// Perform global security token check if needed.
if (object->IsJSGlobalProxy()) {
=======================================
--- /branches/3.9/src/ia32/stub-cache-ia32.cc Wed Mar 14 04:16:03 2012
+++ /branches/3.9/src/ia32/stub-cache-ia32.cc Tue Apr 17 09:09:59 2012
@@ -746,8 +746,10 @@
Register scratch,
Label* miss_label) {
// Check that the map of the object hasn't changed.
+ CompareMapMode mode = transition.is_null() ?
ALLOW_ELEMENT_TRANSITION_MAPS
+ : REQUIRE_EXACT_MAP;
__ CheckMap(receiver_reg, Handle<Map>(object->map()),
- miss_label, DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS);
+ miss_label, DO_SMI_CHECK, mode);
// Perform global security token check if needed.
if (object->IsJSGlobalProxy()) {
=======================================
--- /branches/3.9/src/mips/stub-cache-mips.cc Wed Mar 21 02:52:17 2012
+++ /branches/3.9/src/mips/stub-cache-mips.cc Tue Apr 17 09:09:59 2012
@@ -429,8 +429,10 @@
// a0 : value.
Label exit;
// Check that the map of the object hasn't changed.
+ CompareMapMode mode = transition.is_null() ?
ALLOW_ELEMENT_TRANSITION_MAPS
+ : REQUIRE_EXACT_MAP;
__ CheckMap(receiver_reg, scratch, Handle<Map>(object->map()),
miss_label,
- DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS);
+ DO_SMI_CHECK, mode);
// Perform global security token check if needed.
if (object->IsJSGlobalProxy()) {
=======================================
--- /branches/3.9/src/version.cc Mon Apr 16 07:52:48 2012
+++ /branches/3.9/src/version.cc Tue Apr 17 09:09:59 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 9
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 13
+#define PATCH_LEVEL 14
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.9/src/x64/stub-cache-x64.cc Wed Mar 14 04:16:03 2012
+++ /branches/3.9/src/x64/stub-cache-x64.cc Tue Apr 17 09:09:59 2012
@@ -730,8 +730,10 @@
Register scratch,
Label* miss_label) {
// Check that the map of the object hasn't changed.
+ CompareMapMode mode = transition.is_null() ?
ALLOW_ELEMENT_TRANSITION_MAPS
+ : REQUIRE_EXACT_MAP;
__ CheckMap(receiver_reg, Handle<Map>(object->map()),
- miss_label, DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS);
+ miss_label, DO_SMI_CHECK, mode);
// Perform global security token check if needed.
if (object->IsJSGlobalProxy()) {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
