Reviewers: Søren Gjesse, Description: Add missing smi check in IC for nonexistent properties.
Add regression test. BUG=v8:681 Please review this at http://codereview.chromium.org/1673005/show SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/arm/stub-cache-arm.cc M src/ia32/stub-cache-ia32.cc M src/x64/stub-cache-x64.cc A test/mjsunit/regress/regress-681.js Index: test/mjsunit/regress/regress-681.js =================================================================== --- test/mjsunit/regress/regress-681.js (revision 0) +++ test/mjsunit/regress/regress-681.js (revision 0) @@ -0,0 +1,44 @@ +// 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()); Index: src/ia32/stub-cache-ia32.cc =================================================================== --- src/ia32/stub-cache-ia32.cc (revision 4445) +++ src/ia32/stub-cache-ia32.cc (working copy) @@ -1976,6 +1976,10 @@ // ----------------------------------- 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 // global property cells up to (but not including) the last object // in the prototype chain are empty. Index: src/x64/stub-cache-x64.cc =================================================================== --- src/x64/stub-cache-x64.cc (revision 4445) +++ src/x64/stub-cache-x64.cc (working copy) @@ -1177,6 +1177,9 @@ // Load receiver. __ 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 // global property cells up to (but not including) the last object // in the prototype chain are empty. Index: src/arm/stub-cache-arm.cc =================================================================== --- src/arm/stub-cache-arm.cc (revision 4445) +++ src/arm/stub-cache-arm.cc (working copy) @@ -1420,6 +1420,10 @@ // Load receiver. __ 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. CheckPrototypes(object, r0, last, r3, r1, name, &miss); -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
