From 2c9ac9c7e18ed939cd0d4b5b85fae2f0f42c5021 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Thu, 29 Aug 2013 14:55:45 +0000 Subject: [PATCH] Always visit branches during HGraph building even if constant values indicate that they are unreachable. BUG=chromium:280333 R=mstarzinger@chromium.org Review URL: https://codereview.chromium.org/23623009 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16431 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 10 ------ test/mjsunit/regress/regress-crbug-280333.js | 47 ++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 test/mjsunit/regress/regress-crbug-280333.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index ef0ab42..27d52a8 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -2769,16 +2769,6 @@ void TestContext::BuildBranch(HValue* value) { if (value != NULL && value->CheckFlag(HValue::kIsArguments)) { builder->Bailout(kArgumentsObjectValueInATestContext); } - if (value->IsConstant()) { - HConstant* constant_value = HConstant::cast(value); - if (constant_value->BooleanValue()) { - builder->current_block()->Goto(if_true(), builder->function_state()); - } else { - builder->current_block()->Goto(if_false(), builder->function_state()); - } - builder->set_current_block(NULL); - return; - } HBasicBlock* empty_true = builder->graph()->CreateBasicBlock(); HBasicBlock* empty_false = builder->graph()->CreateBasicBlock(); ToBooleanStub::Types expected(condition()->to_boolean_types()); diff --git a/test/mjsunit/regress/regress-crbug-280333.js b/test/mjsunit/regress/regress-crbug-280333.js new file mode 100644 index 0000000..ca3fdc7 --- /dev/null +++ b/test/mjsunit/regress/regress-crbug-280333.js @@ -0,0 +1,47 @@ +// 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 + +function funky() { return false; } +var global; + +function foo(x, fun) { + var a = x + 1; + var b = x + 2; // Need another Simulate to fold the first one into. + global = true; // Need a side effect to deopt to. + if (fun()) { + return a; + } + return 0; +} + +assertEquals(0, foo(1, funky)); +assertEquals(0, foo(1, funky)); +%OptimizeFunctionOnNextCall(foo); +assertEquals(0, foo(1, funky)); +assertEquals(2, foo(1, function() { return true; })); -- 2.7.4