Skip to content

Commit

Permalink
MIPS: Fix return-value from Array.push stub when pushing non-SMI value
Browse files Browse the repository at this point in the history
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 <fs@opera.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16377 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
  • Loading branch information
plind44@gmail.com committed Aug 28, 2013
1 parent 1e4f407 commit b45fa06
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/mips/stub-cache-mips.cc
Expand Up @@ -1761,25 +1761,25 @@ Handle<Code> 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);
Expand Down
36 changes: 36 additions & 0 deletions 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());

0 comments on commit b45fa06

Please sign in to comment.