Revision: 3120 Author: [email protected] Date: Fri Oct 23 05:18:47 2009 Log: Fix issue with running some constructors having only this.x = ... assignments.
If we had compiled the comment instead of the code it would have worked. BUG=483 TEST=mjsunit/regress/regress-483.js Review URL: http://codereview.chromium.org/332007 http://code.google.com/p/v8/source/detail?r=3120 Added: /branches/bleeding_edge/test/mjsunit/regress/regress-483.js Modified: /branches/bleeding_edge/src/heap.cc ======================================= --- /dev/null +++ /branches/bleeding_edge/test/mjsunit/regress/regress-483.js Fri Oct 23 05:18:47 2009 @@ -0,0 +1,35 @@ +// Copyright 2009 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. + +function X() { + this.x = this.x.x; +} + +X.prototype.x = {x:1} + +new X() + ======================================= --- /branches/bleeding_edge/src/heap.cc Wed Oct 21 08:37:14 2009 +++ /branches/bleeding_edge/src/heap.cc Fri Oct 23 05:18:47 2009 @@ -2257,7 +2257,8 @@ // constructed without having these properties. ASSERT(in_object_properties <= Map::kMaxPreAllocatedPropertyFields); if (fun->shared()->has_only_this_property_assignments() && - fun->shared()->this_property_assignments_count() > 0) { + fun->shared()->this_property_assignments_count() > 0 && + fun->shared()->has_only_simple_this_property_assignments()) { int count = fun->shared()->this_property_assignments_count(); if (count > in_object_properties) { count = in_object_properties; --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
