Reviewers: Benedikt Meurer,
Message:
Hi Benedikt, PTAL, thx,
--Michael
Description:
Fix failing test test-api/CheckCOWArraysCreatedRuntimeCounter
Please review this at https://codereview.chromium.org/85743002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+8, -4 lines):
M src/objects.cc
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
4ea282efd9ec83c310e550f8345e850629b6f454..6e25e624a9110d2ebe307eb653942c49bc98fe12
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -5738,6 +5738,13 @@ Handle<JSObject>
JSObjectWalkVisitor<ContextObject>::StructureWalk(
ASSERT(copying || copy.is_identical_to(object));
+ ElementsKind kind = copy->GetElementsKind();
+ if (copying && IsFastSmiOrObjectElementsKind(kind) &&
+ FixedArray::cast(copy->elements())->map() ==
+ isolate->heap()->fixed_cow_array_map()) {
+ isolate->counters()->cow_arrays_created_runtime()->Increment();
+ }
+
if (!shallow) {
HandleScope scope(isolate);
@@ -5793,16 +5800,13 @@ Handle<JSObject>
JSObjectWalkVisitor<ContextObject>::StructureWalk(
// Deep copy local elements.
// Pixel elements cannot be created using an object literal.
ASSERT(!copy->HasExternalArrayElements());
- switch (copy->GetElementsKind()) {
+ switch (kind) {
case FAST_SMI_ELEMENTS:
case FAST_ELEMENTS:
case FAST_HOLEY_SMI_ELEMENTS:
case FAST_HOLEY_ELEMENTS: {
Handle<FixedArray> elements(FixedArray::cast(copy->elements()));
if (elements->map() == isolate->heap()->fixed_cow_array_map()) {
- if (copying) {
- isolate->counters()->cow_arrays_created_runtime()->Increment();
- }
#ifdef DEBUG
for (int i = 0; i < elements->length(); i++) {
ASSERT(!elements->get(i)->IsJSObject());
--
--
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/groups/opt_out.
