Commit 88a4b0d6 authored by ulan@chromium.org's avatar ulan@chromium.org

Fix deopt in store with effect context.

R=verwaest@chromium.org

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15780 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 8b7164d5
......@@ -4829,11 +4829,12 @@ bool HOptimizedGraphBuilder::TryStorePolymorphicAsMonomorphic(
store = BuildStoreNamedField(
object, name, store_value, types->at(count - 1), &lookup),
true);
Push(result_value);
if (!ast_context()->IsEffect()) Push(result_value);
store->set_position(position);
AddInstruction(store);
AddSimulate(assignment_id);
ast_context()->ReturnValue(Pop());
if (!ast_context()->IsEffect()) Drop(1);
ast_context()->ReturnValue(result_value);
return true;
}
......@@ -5059,13 +5060,14 @@ void HOptimizedGraphBuilder::BuildStoreNamed(Expression* expr,
instr = BuildStoreNamedGeneric(object, name, store_value);
}
Push(result_value);
if (!ast_context()->IsEffect()) Push(result_value);
instr->set_position(position);
AddInstruction(instr);
if (instr->HasObservableSideEffects()) {
AddSimulate(id, REMOVABLE_SIMULATE);
}
return ast_context()->ReturnValue(Pop());
if (!ast_context()->IsEffect()) Drop(1);
return ast_context()->ReturnValue(result_value);
}
......
// 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
// Test deopt after generic store with effect context.
var pro = { x : 1 }
var a = {}
a.__proto__ = pro
delete pro.x
function g(o) {
return 7 + (o.z = 1, 20);
}
g(a);
g(a);
%OptimizeFunctionOnNextCall(g);
Object.defineProperty(pro, "z", {
set: function(v) { %DeoptimizeFunction(g); },
get: function() { return 20; }
});
assertEquals(27, g(a));
// Test deopt after polymorphic as monomorphic store with effect context.
var i = { z : 2, r : 1 }
var j = { z : 2 }
var p = { a : 10 }
var pp = { a : 20, b : 1 }
function bar(o, p) {
return 7 + (o.z = 1, p.a);
}
bar(i, p);
bar(i, p);
bar(j, p);
%OptimizeFunctionOnNextCall(bar);
assertEquals(27, bar(i, pp));
// Test deopt after polymorphic store with effect context.
var i = { r : 1, z : 2 }
var j = { z : 2 }
var p = { a : 10 }
var pp = { a : 20, b : 1 }
function bar1(o, p) {
return 7 + (o.z = 1, p.a);
}
bar1(i, p);
bar1(i, p);
bar1(j, p);
%OptimizeFunctionOnNextCall(bar1);
assertEquals(27, bar1(i, pp));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment