From: verwaest@chromium.org Date: Thu, 20 Sep 2012 13:41:00 +0000 (+0000) Subject: Deopt on storing undefined into double elements. X-Git-Tag: upstream/4.7.83~15964 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea31f868e8b1ee5c51df0135e46f59ba79b232e1;p=platform%2Fupstream%2Fv8.git Deopt on storing undefined into double elements. Review URL: https://chromiumcodereview.appspot.com/10963010 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12568 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h index c87bb55..dfffe41 100644 --- a/src/hydrogen-instructions.h +++ b/src/hydrogen-instructions.h @@ -4527,6 +4527,7 @@ class HStoreKeyedFastDoubleElement SetOperandAt(0, elements); SetOperandAt(1, key); SetOperandAt(2, val); + SetFlag(kDeoptimizeOnUndefined); SetGVNFlag(kChangesDoubleArrayElements); } diff --git a/test/mjsunit/elements-transition-hoisting.js b/test/mjsunit/elements-transition-hoisting.js index 5fb3889..6adbaca 100644 --- a/test/mjsunit/elements-transition-hoisting.js +++ b/test/mjsunit/elements-transition-hoisting.js @@ -226,7 +226,7 @@ if (support_smi_only_arrays) { testStraightLineDupeElinination(new Array(5),0,0,0,.5,0); testStraightLineDupeElinination(new Array(5),0,0,0,0,.5); %OptimizeFunctionOnNextCall(testStraightLineDupeElinination); - testStraightLineDupeElinination(new Array(5)); - testStraightLineDupeElinination(new Array(5)); + testStraightLineDupeElinination(new Array(5),0,0,0,0,0); + testStraightLineDupeElinination(new Array(5),0,0,0,0,0); assertTrue(2 != %GetOptimizationStatus(testStraightLineDupeElinination)); } diff --git a/test/mjsunit/regress/regress-undefined-store-keyed-fast-element.js b/test/mjsunit/regress/regress-undefined-store-keyed-fast-element.js new file mode 100644 index 0000000..9e6ec9d --- /dev/null +++ b/test/mjsunit/regress/regress-undefined-store-keyed-fast-element.js @@ -0,0 +1,37 @@ +// 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 + +function f(v) { + return [0.0, 0.1, 0.2, v]; +} + +assertEquals([0.0, 0.1, 0.2, NaN], f(NaN)); +assertEquals([0.0, 0.1, 0.2, NaN], f(NaN)); +%OptimizeFunctionOnNextCall(f); +assertEquals([0.0, 0.1, 0.2, undefined], f(undefined));