AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fixed compound/count operations with getter-only accessor properties.

Browse Source 
The underlying problem is that for compound/count operations we use the *load*
type feedback for storing, too. For normal properties this doesn't matter, but
for accessor properties we should better use the *store* type feedback, which
would be available, too. This consistent feedback usage could be guaranteed if
we removed the heavy copy-n-paste in the crankshaft code generation for
compound/count operations and assignments/property loads.

To be on the safe side, we postpone this refactoring and do a quick and easily
mergeable fix.

BUG=140083
TEST=mjsunit/regress/regress-crbug-140083.js

Review URL: https://chromiumcodereview.appspot.com/10828146

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12252 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
svenpanne@chromium.org 2012-08-03 09:45:08 +00:00
parent 680c4a7a13
commit 83fc4205f6
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hydrogen.cc
View File

@ -5422,7 +5422,9 @@ void HGraphBuilder::HandleCompoundAssignment(Assignment* expr) {
} else { } else {
Handle<AccessorPair> accessors; Handle<AccessorPair> accessors;
Handle<JSObject> holder; Handle<JSObject> holder;
if (LookupAccessorPair(map, name, &accessors, &holder)) { // Because we re-use the load type feedback, there might be no setter.
if (LookupAccessorPair(map, name, &accessors, &holder) &&
accessors->setter()->IsJSFunction()) {
store = BuildCallSetter(object, instr, map, accessors, holder); store = BuildCallSetter(object, instr, map, accessors, holder);
} else { } else {
CHECK_ALIVE(store = BuildStoreNamedMonomorphic(object, CHECK_ALIVE(store = BuildStoreNamedMonomorphic(object,
@ -7883,7 +7885,9 @@ void HGraphBuilder::VisitCountOperation(CountOperation* expr) {
} else { } else {
Handle<AccessorPair> accessors; Handle<AccessorPair> accessors;
Handle<JSObject> holder; Handle<JSObject> holder;
if (LookupAccessorPair(map, name, &accessors, &holder)) { // Because we re-use the load type feedback, there might be no setter.
if (LookupAccessorPair(map, name, &accessors, &holder) &&
accessors->setter()->IsJSFunction()) {
store = BuildCallSetter(object, after, map, accessors, holder); store = BuildCallSetter(object, after, map, accessors, holder);
} else { } else {
CHECK_ALIVE(store = BuildStoreNamedMonomorphic(object, CHECK_ALIVE(store = BuildStoreNamedMonomorphic(object,

44
test/mjsunit/regress/regress-crbug-140083.js Normal file
View File

@ -0,0 +1,44 @@
// Copyright 2012 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
// Test that the absence of a setter in a compound/count operation works.
Object.defineProperty(Object.prototype, "foo",
{ get: function() { return 123; } });
function bar(o) {
o.foo += 42;
o.foo++;
}
var baz = {};
bar(baz);
bar(baz);
%OptimizeFunctionOnNextCall(bar)
bar(baz);