Commit c678e448 authored by ager@chromium.org's avatar ager@chromium.org

Add missing smi check in IC for nonexistent properties.

Add regression test.

BUG=v8:681
Review URL: http://codereview.chromium.org/1673005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4446 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent fae2b0f1
...@@ -1420,6 +1420,10 @@ Object* LoadStubCompiler::CompileLoadNonexistent(String* name, ...@@ -1420,6 +1420,10 @@ Object* LoadStubCompiler::CompileLoadNonexistent(String* name,
// Load receiver. // Load receiver.
__ ldr(r0, MemOperand(sp, 0)); __ ldr(r0, MemOperand(sp, 0));
// Check that receiver is not a smi.
__ tst(r0, Operand(kSmiTagMask));
__ b(eq, &miss);
// Check the maps of the full prototype chain. // Check the maps of the full prototype chain.
CheckPrototypes(object, r0, last, r3, r1, name, &miss); CheckPrototypes(object, r0, last, r3, r1, name, &miss);
......
...@@ -1976,6 +1976,10 @@ Object* LoadStubCompiler::CompileLoadNonexistent(String* name, ...@@ -1976,6 +1976,10 @@ Object* LoadStubCompiler::CompileLoadNonexistent(String* name,
// ----------------------------------- // -----------------------------------
Label miss; Label miss;
// Check that the receiver isn't a smi.
__ test(eax, Immediate(kSmiTagMask));
__ j(zero, &miss, not_taken);
// Check the maps of the full prototype chain. Also check that // Check the maps of the full prototype chain. Also check that
// global property cells up to (but not including) the last object // global property cells up to (but not including) the last object
// in the prototype chain are empty. // in the prototype chain are empty.
......
...@@ -1177,6 +1177,9 @@ Object* LoadStubCompiler::CompileLoadNonexistent(String* name, ...@@ -1177,6 +1177,9 @@ Object* LoadStubCompiler::CompileLoadNonexistent(String* name,
// Load receiver. // Load receiver.
__ movq(rax, Operand(rsp, kPointerSize)); __ movq(rax, Operand(rsp, kPointerSize));
// Chech that receiver is not a smi.
__ JumpIfSmi(rax, &miss);
// Check the maps of the full prototype chain. Also check that // Check the maps of the full prototype chain. Also check that
// global property cells up to (but not including) the last object // global property cells up to (but not including) the last object
// in the prototype chain are empty. // in the prototype chain are empty.
......
// Copyright 2010 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.
// Regression test for http://code.google.com/p/v8/issues/detail?id=681.
//
// Test that load ICs for nonexistent properties bail out on smi receiver.
var x = {};
function f() { return x.y; }
// Initialize IC for nonexistent y property on x.
f();
f();
// Make x a smi.
x = 23;
// Check that we bail out from the IC.
assertEquals(undefined, f());
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