From 9efb5cd23b7ff3af4c24f86dd2dbad21e36b6dc4 Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 30 Aug 2013 10:51:37 +0000 Subject: [PATCH] Make VisitStatements() consistent among all AstVisitor implementations R=yangguo@chromium.org Review URL: https://codereview.chromium.org/23441018 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16443 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ast.cc | 4 ++- src/hydrogen.cc | 4 ++- test/mjsunit/compiler/type-feedback-after-throw.js | 38 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 test/mjsunit/compiler/type-feedback-after-throw.js diff --git a/src/ast.cc b/src/ast.cc index 38c6ddd..8734171 100644 --- a/src/ast.cc +++ b/src/ast.cc @@ -708,7 +708,9 @@ void AstVisitor::VisitDeclarations(ZoneList* declarations) { void AstVisitor::VisitStatements(ZoneList* statements) { for (int i = 0; i < statements->length(); i++) { - Visit(statements->at(i)); + Statement* stmt = statements->at(i); + Visit(stmt); + if (stmt->IsJump()) break; } } diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 27d52a8..feacefd 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -3113,7 +3113,9 @@ void HOptimizedGraphBuilder::SetUpScope(Scope* scope) { void HOptimizedGraphBuilder::VisitStatements(ZoneList* statements) { for (int i = 0; i < statements->length(); i++) { - CHECK_ALIVE(Visit(statements->at(i))); + Statement* stmt = statements->at(i); + CHECK_ALIVE(Visit(stmt)); + if (stmt->IsJump()) break; } } diff --git a/test/mjsunit/compiler/type-feedback-after-throw.js b/test/mjsunit/compiler/type-feedback-after-throw.js new file mode 100644 index 0000000..891e315 --- /dev/null +++ b/test/mjsunit/compiler/type-feedback-after-throw.js @@ -0,0 +1,38 @@ +// 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 foo() { + throw "Error"; + return 1 > 5; +}; + +try { foo() } catch(e) {} +try { foo() } catch(e) {} +%OptimizeFunctionOnNextCall(foo); +try { foo() } catch(e) {} -- 2.7.4