Fix bogus deopt in BuildEmitDeepCopy for holey arrays.

R=verwaest@chromium.org
BUG=chromium:242924
TEST=mjsunit/regress/regress-crbug-242924

Review URL: https://codereview.chromium.org/15735012

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14757 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent d1b5a251
...@@ -11012,9 +11012,11 @@ void HOptimizedGraphBuilder::BuildEmitDeepCopy( ...@@ -11012,9 +11012,11 @@ void HOptimizedGraphBuilder::BuildEmitDeepCopy(
AddInstruction(new(zone) HConstant(i, Representation::Integer32())); AddInstruction(new(zone) HConstant(i, Representation::Integer32()));
HInstruction* value_instruction = HInstruction* value_instruction =
AddInstruction(new(zone) HLoadKeyed( AddInstruction(new(zone) HLoadKeyed(
boilerplate_elements, key_constant, NULL, kind)); boilerplate_elements, key_constant, NULL, kind,
AddInstruction(new(zone) HStoreKeyed( ALLOW_RETURN_HOLE));
HInstruction* store = AddInstruction(new(zone) HStoreKeyed(
object_elements, key_constant, value_instruction, kind)); object_elements, key_constant, value_instruction, kind));
store->ClearFlag(HValue::kDeoptimizeOnUndefined);
} }
} else if (elements->IsFixedArray()) { } else if (elements->IsFixedArray()) {
Handle<FixedArray> fast_elements = Handle<FixedArray>::cast(elements); Handle<FixedArray> fast_elements = Handle<FixedArray>::cast(elements);
...@@ -11037,7 +11039,8 @@ void HOptimizedGraphBuilder::BuildEmitDeepCopy( ...@@ -11037,7 +11039,8 @@ void HOptimizedGraphBuilder::BuildEmitDeepCopy(
} else { } else {
HInstruction* value_instruction = HInstruction* value_instruction =
AddInstruction(new(zone) HLoadKeyed( AddInstruction(new(zone) HLoadKeyed(
boilerplate_elements, key_constant, NULL, kind)); boilerplate_elements, key_constant, NULL, kind,
ALLOW_RETURN_HOLE));
AddInstruction(new(zone) HStoreKeyed( AddInstruction(new(zone) HStoreKeyed(
object_elements, key_constant, value_instruction, kind)); object_elements, key_constant, value_instruction, kind));
} }
......
// 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 --expose-gc --gc-global
function f() {
return [,{}];
}
assertEquals([,{}], f());
assertEquals([,{}], f());
%OptimizeFunctionOnNextCall(f);
assertEquals([,{}], f());
gc();
function g() {
return [[,1.5],{}];
}
assertEquals([[,1.5],{}], g());
assertEquals([[,1.5],{}], g());
%OptimizeFunctionOnNextCall(g);
assertEquals([[,1.5],{}], g());
gc();
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