Fix Object.freeze, Object.observe wrt CountOperation and CompoundAssignment.
BUG=2774,2779 R=adamk@chromium.org Review URL: https://chromiumcodereview.appspot.com/22562004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16111 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
56ca64e98c
commit
e5afd32129
@ -5039,7 +5039,7 @@ void HOptimizedGraphBuilder::HandleCompoundAssignment(Assignment* expr) {
|
||||
Add<HSimulate>(operation->id(), REMOVABLE_SIMULATE);
|
||||
}
|
||||
|
||||
return BuildStoreNamed(prop, expr->id(), expr->position(),
|
||||
return BuildStoreNamed(expr, expr->id(), expr->position(),
|
||||
expr->AssignmentId(), prop, object, instr, instr);
|
||||
} else {
|
||||
// Keyed property.
|
||||
@ -7474,7 +7474,7 @@ void HOptimizedGraphBuilder::VisitCountOperation(CountOperation* expr) {
|
||||
after = BuildIncrement(returns_original_input, expr);
|
||||
HValue* result = returns_original_input ? Pop() : after;
|
||||
|
||||
return BuildStoreNamed(prop, expr->id(), expr->position(),
|
||||
return BuildStoreNamed(expr, expr->id(), expr->position(),
|
||||
expr->AssignmentId(), prop, object, after, result);
|
||||
} else {
|
||||
// Keyed property.
|
||||
|
@ -388,9 +388,7 @@ void AstTyper::VisitAssignment(Assignment* expr) {
|
||||
Property* prop = target->AsProperty();
|
||||
if (prop != NULL) {
|
||||
prop->RecordTypeFeedback(oracle(), zone());
|
||||
if (!prop->key()->IsPropertyName()) { // i.e., keyed
|
||||
expr->RecordTypeFeedback(oracle(), zone());
|
||||
}
|
||||
expr->RecordTypeFeedback(oracle(), zone());
|
||||
}
|
||||
|
||||
RECURSE(Visit(expr->binary_operation()));
|
||||
|
@ -646,9 +646,8 @@ function recursiveObserver2(r) {
|
||||
Object.observe(obj1, recursiveObserver2);
|
||||
Object.observe(obj2, recursiveObserver2);
|
||||
++obj1.a;
|
||||
// TODO(verwaest): Disabled because of bug 2774.
|
||||
// Object.deliverChangeRecords(recursiveObserver2);
|
||||
// assertEquals(199, recordCount);
|
||||
Object.deliverChangeRecords(recursiveObserver2);
|
||||
assertEquals(199, recordCount);
|
||||
|
||||
|
||||
// Observing named properties.
|
||||
|
46
test/mjsunit/regress/regress-freeze.js
Normal file
46
test/mjsunit/regress/regress-freeze.js
Normal file
@ -0,0 +1,46 @@
|
||||
// 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
|
||||
|
||||
// CountOperation
|
||||
function f(o) { o.x++ };
|
||||
var o = {x: 5};
|
||||
Object.freeze(o);
|
||||
f(o);
|
||||
f(o);
|
||||
%OptimizeFunctionOnNextCall(f);
|
||||
f(o);
|
||||
assertEquals(5, o.x);
|
||||
|
||||
// Compound Assignment
|
||||
function f2(o) { o.x+=3 };
|
||||
f2(o);
|
||||
f2(o);
|
||||
%OptimizeFunctionOnNextCall(f2);
|
||||
f2(o);
|
||||
assertEquals(5, o.x);
|
Loading…
Reference in New Issue
Block a user