Fix receiver check in arguments ICs.
The receiver needs to be checked in the same way as all other KeyedLoadICs to take non-JSObject and objects that require access checks or has interceptors into account. R=sgjesse@chromium.org BUG=87478 TEST=mjsunit/regress/regress-crbug-87478.js Review URL: http://codereview.chromium.org/7259015 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8429 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
54d6072332
commit
89cc886ba7
@ -892,8 +892,13 @@ static MemOperand GenerateMappedArgumentsLookup(MacroAssembler* masm,
|
||||
Label* slow_case) {
|
||||
Heap* heap = masm->isolate()->heap();
|
||||
|
||||
// Check that the receiver isn't a smi.
|
||||
// Check that the receiver is a JSObject. Because of the map check
|
||||
// later, we do not need to check for interceptors or whether it
|
||||
// requires access checks.
|
||||
__ JumpIfSmi(object, slow_case);
|
||||
// Check that the object is some kind of JSObject.
|
||||
__ CompareObjectType(object, scratch1, scratch2, FIRST_JS_RECEIVER_TYPE);
|
||||
__ b(lt, slow_case);
|
||||
|
||||
// Check that the key is a positive smi.
|
||||
__ tst(key, Operand(0x8000001));
|
||||
|
@ -473,8 +473,13 @@ static Operand GenerateMappedArgumentsLookup(MacroAssembler* masm,
|
||||
Heap* heap = masm->isolate()->heap();
|
||||
Factory* factory = masm->isolate()->factory();
|
||||
|
||||
// Check that the receiver isn't a smi.
|
||||
// Check that the receiver is a JSObject. Because of the elements
|
||||
// map check later, we do not need to check for interceptors or
|
||||
// whether it requires access checks.
|
||||
__ JumpIfSmi(object, slow_case);
|
||||
// Check that the object is some kind of JSObject.
|
||||
__ CmpObjectType(object, FIRST_JS_RECEIVER_TYPE, scratch1);
|
||||
__ j(below, slow_case);
|
||||
|
||||
// Check that the key is a positive smi.
|
||||
__ test(key, Immediate(0x8000001));
|
||||
|
@ -1208,8 +1208,13 @@ static Operand GenerateMappedArgumentsLookup(MacroAssembler* masm,
|
||||
Label* slow_case) {
|
||||
Heap* heap = masm->isolate()->heap();
|
||||
|
||||
// Check that the receiver isn't a smi.
|
||||
// Check that the receiver is a JSObject. Because of the elements
|
||||
// map check later, we do not need to check for interceptors or
|
||||
// whether it requires access checks.
|
||||
__ JumpIfSmi(object, slow_case);
|
||||
// Check that the object is some kind of JSObject.
|
||||
__ CmpObjectType(object, FIRST_JS_RECEIVER_TYPE, scratch1);
|
||||
__ j(below, slow_case);
|
||||
|
||||
// Check that the key is a positive smi.
|
||||
Condition check = masm->CheckNonNegativeSmi(key);
|
||||
|
36
test/mjsunit/regress/regress-crbug-87478.js
Normal file
36
test/mjsunit/regress/regress-crbug-87478.js
Normal file
@ -0,0 +1,36 @@
|
||||
// Copyright 2011 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 that arguments access ICs correctly handle non-JSObject
|
||||
// receivers.
|
||||
function f(array) { return array[0]; }
|
||||
function args(a) { return arguments; }
|
||||
// Put the keyed load in f into the keyed-load-arguments state.
|
||||
for (var i = 0; i < 10; i++) {
|
||||
f(args(1));
|
||||
}
|
||||
f('123');
|
Loading…
Reference in New Issue
Block a user