From b45fa06231b539cb4b80cf9a0897689264b4dd97 Mon Sep 17 00:00:00 2001 From: "plind44@gmail.com" Date: Wed, 28 Aug 2013 05:23:51 +0000 Subject: [PATCH] MIPS: Fix return-value from Array.push stub when pushing non-SMI value Load and update the arrays length in v0 to make sure the length gets returned correctly when leaving the function. Add new testcase. TEST=mjsunit/array-push-non-smi-value BUG=130022 R=jkummerow@chromium.org, plind44@gmail.com Review URL: https://codereview.chromium.org/23589002 Patch from fs . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16377 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/stub-cache-mips.cc | 12 ++++---- test/mjsunit/array-push-non-smi-value.js | 36 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 test/mjsunit/array-push-non-smi-value.js diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc index df779ff6a6cc..ccbe86a5d629 100644 --- a/src/mips/stub-cache-mips.cc +++ b/src/mips/stub-cache-mips.cc @@ -1761,25 +1761,25 @@ Handle CallStubCompiler::CompileArrayPushCall( &call_builtin, DONT_DO_SMI_CHECK); - // Get the array's length into r0 and calculate new length. - __ lw(a0, FieldMemOperand(receiver, JSArray::kLengthOffset)); + // Get the array's length into v0 and calculate new length. + __ lw(v0, FieldMemOperand(receiver, JSArray::kLengthOffset)); STATIC_ASSERT(kSmiTagSize == 1); STATIC_ASSERT(kSmiTag == 0); - __ Addu(a0, a0, Operand(Smi::FromInt(argc))); + __ Addu(v0, v0, Operand(Smi::FromInt(argc))); // Get the elements' length. __ lw(t0, FieldMemOperand(elements, FixedArray::kLengthOffset)); // Check if we could survive without allocation. - __ Branch(&call_builtin, gt, a0, Operand(t0)); + __ Branch(&call_builtin, gt, v0, Operand(t0)); __ lw(t0, MemOperand(sp, (argc - 1) * kPointerSize)); __ StoreNumberToDoubleElements( - t0, a0, elements, a3, t1, a2, t5, + t0, v0, elements, a3, t1, a2, t5, &call_builtin, argc * kDoubleSize); // Save new length. - __ sw(a0, FieldMemOperand(receiver, JSArray::kLengthOffset)); + __ sw(v0, FieldMemOperand(receiver, JSArray::kLengthOffset)); // Check for a smi. __ DropAndRet(argc + 1); diff --git a/test/mjsunit/array-push-non-smi-value.js b/test/mjsunit/array-push-non-smi-value.js new file mode 100644 index 000000000000..460dd2a911e8 --- /dev/null +++ b/test/mjsunit/array-push-non-smi-value.js @@ -0,0 +1,36 @@ +// 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. + +// Check pushes of non-SMI values. +var a = []; +function func() { + return a.push(0x40000000) > 60; +} + +assertFalse(func()); +assertFalse(func()); +assertFalse(func());