Reviewers: Michael Starzinger,
Message:
PTAL
Description:
Fix Array.prototype.push wrt changes to Array.prototype
BUG=
Please review this at https://codereview.chromium.org/228613004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+58, -0 lines):
M src/builtins.cc
M src/hydrogen.cc
A test/mjsunit/array-push2.js
A test/mjsunit/array-push3.js
Index: src/builtins.cc
diff --git a/src/builtins.cc b/src/builtins.cc
index
463a15f6c3b4d650a433f77d988e72539a60aaae..23f8f9aec1c5b6cb7b1665c85c70678f7893a9da
100644
--- a/src/builtins.cc
+++ b/src/builtins.cc
@@ -299,6 +299,9 @@ static inline MaybeHandle<FixedArrayBase>
EnsureJSArrayWithWritableFastElements(
Handle<Object> receiver,
Arguments* args,
int first_added_arg) {
+ if (!isolate->IsFastArrayConstructorPrototypeChainIntact()) {
+ return MaybeHandle<FixedArrayBase>();
+ }
if (!receiver->IsJSArray()) return MaybeHandle<FixedArrayBase>();
Handle<JSArray> array = Handle<JSArray>::cast(receiver);
if (array->map()->is_observed()) return MaybeHandle<FixedArrayBase>();
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
d759b657bab40f89a6053be6809f5dc18d4f68d9..78429c478acd6c00ad83aba01494f928883a5e9f
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -7658,6 +7658,11 @@ bool
HOptimizedGraphBuilder::TryInlineBuiltinMethodCall(
case kArrayPush: {
if (receiver_map.is_null()) return false;
if (receiver_map->instance_type() != JS_ARRAY_TYPE) return false;
+ if (isolate()->IsFastArrayConstructorPrototypeChainIntact()) {
+ graph()->MarkDependsOnEmptyArrayProtoElements();
+ } else {
+ return false;
+ }
ElementsKind elements_kind = receiver_map->elements_kind();
if (!IsFastElementsKind(elements_kind)) return false;
Index: test/mjsunit/array-push2.js
diff --git a/test/mjsunit/array-push2.js b/test/mjsunit/array-push2.js
new file mode 100644
index
0000000000000000000000000000000000000000..fe4be4eb3e852bb0d7e6bc0f3c99fa2dea45870f
--- /dev/null
+++ b/test/mjsunit/array-push2.js
@@ -0,0 +1,21 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+var array = [];
+var v = 0;
+
+Object.defineProperty(Array.prototype, "0", {
+ get: function() { return "get " + v; },
+ set: function(value) { v += value; }
+});
+
+array[0] = 10;
+assertEquals(0, array.length);
+assertEquals(10, v);
+assertEquals("get 10", array[0]);
+
+array.push(100);
+assertEquals(1, array.length);
+assertEquals(110, v);
+assertEquals("get 110", array[0]);
Index: test/mjsunit/array-push3.js
diff --git a/test/mjsunit/array-push3.js b/test/mjsunit/array-push3.js
new file mode 100644
index
0000000000000000000000000000000000000000..99bd857a7386f260d31f86ebd2f5d3bede325eea
--- /dev/null
+++ b/test/mjsunit/array-push3.js
@@ -0,0 +1,29 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax
+
+var array = [];
+
+function push(array, value) {
+ array.push(value);
+}
+
+push(array, 0);
+push(array, 1);
+push(array, 2);
+%OptimizeFunctionOnNextCall(push);
+push(array, 3);
+
+var v = 0;
+Object.defineProperty(Array.prototype, "4", {
+ get: function() { return 100; },
+ set: function(value) { v = value; }
+});
+
+push(array, 4);
+
+assertEquals(5, array.length);
+assertEquals(100, array[4]);
+assertEquals(4, v);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
