Commit d672142f authored by Mike Stanton's avatar Mike Stanton Committed by Commit Bot

Array.prototype.filter builtin should respect initial ElementsKind

If the input array is a JSArray with fast elements, it makes sense
to create an output array of the same ElementsKind when possible.

Bug: v8:1956
Change-Id: Ie9c937cf1751ccbbbe7cc76f40e1e1a0328ed37c
Reviewed-on: https://chromium-review.googlesource.com/730748
Commit-Queue: Michael Stanton <mvstanton@chromium.org>
Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48789}
parent df96dfeb
......@@ -92,8 +92,9 @@ class ArrayBuiltinCodeStubAssembler : public CodeStubAssembler {
void FilterResultGenerator() {
// 7. Let A be ArraySpeciesCreate(O, 0).
Node* len = SmiConstant(0);
ArraySpeciesCreate(len);
// This version of ArraySpeciesCreate will create with the correct
// ElementsKind in the fast case.
ArraySpeciesCreate();
}
Node* FilterProcessor(Node* k_value, Node* k) {
......@@ -743,7 +744,55 @@ class ArrayBuiltinCodeStubAssembler : public CodeStubAssembler {
}
// Perform ArraySpeciesCreate (ES6 #sec-arrayspeciescreate).
void ArraySpeciesCreate(Node* len) {
// This version is specialized to create a zero length array
// of the elements kind of the input array.
void ArraySpeciesCreate() {
Label runtime(this, Label::kDeferred), done(this);
TNode<Smi> len = SmiConstant(0);
TNode<Map> original_map = LoadMap(o());
GotoIfNot(
InstanceTypeEqual(LoadMapInstanceType(original_map), JS_ARRAY_TYPE),
&runtime);
GotoIfNot(IsPrototypeInitialArrayPrototype(context(), original_map),
&runtime);
Node* species_protector = SpeciesProtectorConstant();
Node* value =
LoadObjectField(species_protector, PropertyCell::kValueOffset);
TNode<Smi> const protector_invalid =
SmiConstant(Isolate::kProtectorInvalid);
GotoIf(WordEqual(value, protector_invalid), &runtime);
// Respect the ElementsKind of the input array.
TNode<Int32T> elements_kind = LoadMapElementsKind(original_map);
GotoIfNot(IsFastElementsKind(elements_kind), &runtime);
TNode<Context> native_context = CAST(LoadNativeContext(context()));
TNode<Map> array_map =
CAST(LoadJSArrayElementsMap(elements_kind, native_context));
TNode<JSArray> array =
CAST(AllocateJSArray(GetInitialFastElementsKind(), array_map, len, len,
nullptr, CodeStubAssembler::SMI_PARAMETERS));
a_.Bind(array);
Goto(&done);
BIND(&runtime);
{
// 5. Let A be ? ArraySpeciesCreate(O, len).
Node* constructor =
CallRuntime(Runtime::kArraySpeciesConstructor, context(), o());
a_.Bind(ConstructJS(CodeFactory::Construct(isolate()), context(),
constructor, len));
Goto(&fully_spec_compliant_);
}
BIND(&done);
}
// Perform ArraySpeciesCreate (ES6 #sec-arrayspeciescreate).
void ArraySpeciesCreate(SloppyTNode<Smi> len) {
Label runtime(this, Label::kDeferred), done(this);
Node* const original_map = LoadMap(o());
......@@ -769,8 +818,9 @@ class ArrayBuiltinCodeStubAssembler : public CodeStubAssembler {
// element in the input array (maybe the callback deletes an element).
const ElementsKind elements_kind =
GetHoleyElementsKind(GetInitialFastElementsKind());
Node* const native_context = LoadNativeContext(context());
Node* array_map = LoadJSArrayElementsMap(elements_kind, native_context);
TNode<Context> native_context = CAST(LoadNativeContext(context()));
TNode<Map> array_map =
CAST(LoadJSArrayElementsMap(elements_kind, native_context));
a_.Bind(AllocateJSArray(PACKED_SMI_ELEMENTS, array_map, len, len, nullptr,
CodeStubAssembler::SMI_PARAMETERS));
......
// 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 --expose-gc --opt --no-always-opt
var elements_kind = {
fast_smi_only : 'fast smi only elements',
fast : 'fast elements',
fast_double : 'fast double elements',
dictionary : 'dictionary elements',
external_byte : 'external byte elements',
external_unsigned_byte : 'external unsigned byte elements',
external_short : 'external short elements',
external_unsigned_short : 'external unsigned short elements',
external_int : 'external int elements',
external_unsigned_int : 'external unsigned int elements',
external_float : 'external float elements',
external_double : 'external double elements',
external_pixel : 'external pixel elements'
}
function getKind(obj) {
if (%HasSmiElements(obj)) return elements_kind.fast_smi_only;
if (%HasObjectElements(obj)) return elements_kind.fast;
if (%HasDoubleElements(obj)) return elements_kind.fast_double;
if (%HasDictionaryElements(obj)) return elements_kind.dictionary;
}
function isHoley(obj) {
if (%HasHoleyElements(obj)) return true;
return false;
}
function assertKind(expected, obj, name_opt) {
assertEquals(expected, getKind(obj), name_opt);
}
function assertHoley(obj, name_opt) {
assertEquals(true, isHoley(obj), name_opt);
}
function assertNotHoley(obj, name_opt) {
assertEquals(false, isHoley(obj), name_opt);
}
var a;
// Packed literal arrays.
obj = [1, 2, 3];
a = obj.filter(x => false);
assertKind(elements_kind.fast_smi_only, a);
assertNotHoley(a);
obj = [true, true, false];
a = obj.filter(x => false);
assertKind(elements_kind.fast, a);
assertNotHoley(a);
obj = [1.0, 1.5, 3.5];
a = obj.filter(x => false);
assertKind(elements_kind.fast_double, a);
assertNotHoley(a);
// Holey literal arrays.
obj = [1,, 3]; obj[1] = 2;
a = obj.filter(x => false);
assertKind(elements_kind.fast_smi_only, a);
assertHoley(a);
obj = [true,, false]; obj[1] = true;
a = obj.filter(x => false);
assertKind(elements_kind.fast, a);
assertHoley(a);
obj = [1.0,, 3.5]; obj[1] = 1.5;
a = obj.filter(x => false);
assertKind(elements_kind.fast_double, a);
assertHoley(a);
// Packed constructed arrays.
obj = new Array(1, 2, 3);
a = obj.filter(x => false);
assertKind(elements_kind.fast_smi_only, a);
assertNotHoley(a);
obj = new Array(true, true, false);
a = obj.filter(x => false);
assertKind(elements_kind.fast, a);
assertNotHoley(a);
obj = new Array(1.0, 1.5, 3.5);
a = obj.filter(x => false);
assertKind(elements_kind.fast_double, a);
assertNotHoley(a);
// Holey constructed arrays.
obj = new Array(3);
obj[0] = 1; obj[1] = 2; obj[2] = 3;
a = obj.filter(x => false);
assertKind(elements_kind.fast_smi_only, a);
assertHoley(a);
obj = new Array(3);
obj[0] = true; obj[1] = true; obj[2] = false;
a = obj.filter(x => false);
assertKind(elements_kind.fast, a);
assertHoley(a);
obj = new Array(3);
obj[0] = 1.0; obj[1] = 1.5; obj[2] = 3.5;
a = obj.filter(x => false);
assertKind(elements_kind.fast_double, a);
assertHoley(a);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment