From 9e70f6a4e75f6f8ad39877aba44d06c43a0cf21d Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Mon, 3 Feb 2014 14:29:34 +0000 Subject: [PATCH] Fix short-circuiting logical and/or in HOptimizedGraphBuilder. R=jkummerow@chromium.org BUG=336148 LOG=Y Review URL: https://codereview.chromium.org/143263022 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19031 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 13 ++++--- test/mjsunit/regress/regress-crbug-336148.js | 56 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 test/mjsunit/regress/regress-crbug-336148.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 298496f..0aa96e8 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -9522,11 +9522,14 @@ void HOptimizedGraphBuilder::VisitLogicalExpression(BinaryOperation* expr) { ASSERT(current_block() != NULL); HValue* left_value = Top(); - if (left_value->IsConstant()) { - HConstant* left_constant = HConstant::cast(left_value); - if ((is_logical_and && left_constant->BooleanValue()) || - (!is_logical_and && !left_constant->BooleanValue())) { - Drop(1); // left_value. + // Short-circuit left values that always evaluate to the same boolean value. + if (expr->left()->ToBooleanIsTrue() || expr->left()->ToBooleanIsFalse()) { + // l (evals true) && r -> r + // l (evals true) || r -> l + // l (evals false) && r -> l + // l (evals false) || r -> r + if (is_logical_and == expr->left()->ToBooleanIsTrue()) { + Drop(1); CHECK_ALIVE(VisitForValue(expr->right())); } return ast_context()->ReturnValue(Pop()); diff --git a/test/mjsunit/regress/regress-crbug-336148.js b/test/mjsunit/regress/regress-crbug-336148.js new file mode 100644 index 0000000..8157c9f --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-336148.js @@ -0,0 +1,56 @@ +// Copyright 2014 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(o) { + var a = 1; + if (true) return o.v && a; +} + +f({}); +f({}); +%OptimizeFunctionOnNextCall(f); +assertEquals(1, f({ v: 1 })); + + +function f1() { return 1 && 2; }; +function f2() { return 1 || 2; }; +function f3() { return 0 && 2; }; +function f4() { return 0 || 2; }; + +function test() { + assertEquals(2, f1()); + assertEquals(1, f2()); + assertEquals(0, f3()); + assertEquals(2, f4()); +} + +test(); +test(); +[f1, f2, f3, f4].forEach(function(f) { %OptimizeFunctionOnNextCall(f); }); +test(); -- 2.7.4