Fix for bug 245480. Calling new Array(a) with a single argument could result in creating a holey array with a packed elements kind.
BUG=245480 R=verwaest@chromium.org Review URL: https://codereview.chromium.org/16341004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15095 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
5692ec5599
commit
75afb8ce79
@ -4178,8 +4178,26 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) {
|
||||
ArrayNoArgumentConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
} else if (instr->arity() == 1) {
|
||||
Label done;
|
||||
if (IsFastPackedElementsKind(kind)) {
|
||||
Label packed_case;
|
||||
// We might need a change here
|
||||
// look at the first argument
|
||||
__ ldr(r5, MemOperand(sp, 0));
|
||||
__ cmp(r5, Operand::Zero());
|
||||
__ b(eq, &packed_case);
|
||||
|
||||
ElementsKind holey_kind = GetHoleyElementsKind(kind);
|
||||
ArraySingleArgumentConstructorStub stub(holey_kind,
|
||||
disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
__ jmp(&done);
|
||||
__ bind(&packed_case);
|
||||
}
|
||||
|
||||
ArraySingleArgumentConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
__ bind(&done);
|
||||
} else {
|
||||
ArrayNArgumentsConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
|
@ -4225,8 +4225,26 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) {
|
||||
ArrayNoArgumentConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
} else if (instr->arity() == 1) {
|
||||
Label done;
|
||||
if (IsFastPackedElementsKind(kind)) {
|
||||
Label packed_case;
|
||||
// We might need a change here
|
||||
// look at the first argument
|
||||
__ mov(ecx, Operand(esp, 0));
|
||||
__ test(ecx, ecx);
|
||||
__ j(zero, &packed_case);
|
||||
|
||||
ElementsKind holey_kind = GetHoleyElementsKind(kind);
|
||||
ArraySingleArgumentConstructorStub stub(holey_kind,
|
||||
disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
__ jmp(&done);
|
||||
__ bind(&packed_case);
|
||||
}
|
||||
|
||||
ArraySingleArgumentConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
__ bind(&done);
|
||||
} else {
|
||||
ArrayNArgumentsConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
|
@ -3923,8 +3923,26 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) {
|
||||
ArrayNoArgumentConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
} else if (instr->arity() == 1) {
|
||||
Label done;
|
||||
if (IsFastPackedElementsKind(kind)) {
|
||||
Label packed_case;
|
||||
// We might need a change here
|
||||
// look at the first argument
|
||||
__ movq(rcx, Operand(rsp, 0));
|
||||
__ testq(rcx, rcx);
|
||||
__ j(zero, &packed_case);
|
||||
|
||||
ElementsKind holey_kind = GetHoleyElementsKind(kind);
|
||||
ArraySingleArgumentConstructorStub stub(holey_kind,
|
||||
disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
__ jmp(&done);
|
||||
__ bind(&packed_case);
|
||||
}
|
||||
|
||||
ArraySingleArgumentConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
__ bind(&done);
|
||||
} else {
|
||||
ArrayNArgumentsConstructorStub stub(kind, disable_allocation_sites);
|
||||
CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
||||
|
90
test/mjsunit/regress/regress-crbug-245480.js
Normal file
90
test/mjsunit/regress/regress-crbug-245480.js
Normal file
@ -0,0 +1,90 @@
|
||||
// Copyright 2013 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 --smi-only-arrays --expose-gc
|
||||
// Flags: --track-allocation-sites --noalways-opt
|
||||
|
||||
// Test element kind of objects.
|
||||
// Since --smi-only-arrays affects builtins, its default setting at compile
|
||||
// time sticks if built with snapshot. If --smi-only-arrays is deactivated
|
||||
// by default, only a no-snapshot build actually has smi-only arrays enabled
|
||||
// in this test case. Depending on whether smi-only arrays are actually
|
||||
// enabled, this test takes the appropriate code path to check smi-only arrays.
|
||||
|
||||
// support_smi_only_arrays = %HasFastSmiElements(new Array(1,2,3,4,5,6,7,8));
|
||||
support_smi_only_arrays = true;
|
||||
|
||||
if (support_smi_only_arrays) {
|
||||
print("Tests include smi-only arrays.");
|
||||
} else {
|
||||
print("Tests do NOT include smi-only arrays.");
|
||||
}
|
||||
|
||||
function isHoley(obj) {
|
||||
if (%HasFastHoleyElements(obj)) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
function assertHoley(obj, name_opt) {
|
||||
assertEquals(true, isHoley(obj), name_opt);
|
||||
}
|
||||
|
||||
function assertNotHoley(obj, name_opt) {
|
||||
assertEquals(false, isHoley(obj), name_opt);
|
||||
}
|
||||
|
||||
if (support_smi_only_arrays) {
|
||||
function create_array(arg) {
|
||||
return new Array(arg);
|
||||
}
|
||||
|
||||
obj = create_array(0);
|
||||
assertNotHoley(obj);
|
||||
create_array(0);
|
||||
%OptimizeFunctionOnNextCall(create_array);
|
||||
obj = create_array(10);
|
||||
assertHoley(obj);
|
||||
}
|
||||
|
||||
// The code below would assert in debug or crash in release
|
||||
function f(length) {
|
||||
return new Array(length)
|
||||
}
|
||||
|
||||
f(0);
|
||||
f(0);
|
||||
%OptimizeFunctionOnNextCall(f);
|
||||
var a = f(10);
|
||||
|
||||
function g(a) {
|
||||
return a[0];
|
||||
}
|
||||
|
||||
var b = [0];
|
||||
g(b);
|
||||
g(b);
|
||||
assertEquals(undefined, g(a));
|
Loading…
Reference in New Issue
Block a user