From b4058a3bd4d8147234f4abc043e9bf87250e0e44 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 31 May 2013 15:50:19 +0000 Subject: [PATCH] Fast literals: fixed initialization of non-copied in-object property fields BUG=chromium:245424 R=mstarzinger@chromium.org Review URL: https://codereview.chromium.org/16190008 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14906 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 4 ++- test/mjsunit/regress/regress-crbug-245424.js | 41 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-crbug-245424.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 54a5225..7ee6081 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -10059,7 +10059,9 @@ void HOptimizedGraphBuilder::BuildEmitInObjectProperties( HConstant(isolate()->factory()->one_pointer_filler_map(), Representation::Tagged())); for (int i = copied_fields; i < inobject_properties; i++) { - HObjectAccess access = HObjectAccess::ForJSObjectOffset(i); + ASSERT(boilerplate_object->IsJSObject()); + int property_offset = boilerplate_object->GetInObjectPropertyOffset(i); + HObjectAccess access = HObjectAccess::ForJSObjectOffset(property_offset); AddStore(object_properties, access, value_instruction); } } diff --git a/test/mjsunit/regress/regress-crbug-245424.js b/test/mjsunit/regress/regress-crbug-245424.js new file mode 100644 index 0000000..005c8ba --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-245424.js @@ -0,0 +1,41 @@ +// 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. + +// Flags: --allow-natives-syntax + +function boom() { + var a = { + foo: "bar", + foo: "baz" + }; + return a; +} + +assertEquals("baz", boom().foo); +assertEquals("baz", boom().foo); +%OptimizeFunctionOnNextCall(boom); +assertEquals("baz", boom().foo); -- 2.7.4