From 6443cb99f7683d6e68bcc918c6354cd7a16c5b61 Mon Sep 17 00:00:00 2001 From: "kmillikin@chromium.org" Date: Wed, 15 Jul 2009 08:57:25 +0000 Subject: [PATCH] Fix issue 345 by avoiding duplicates in the list of escaping labels from a try...catch...finally statement. Review URL: http://codereview.chromium.org/149670 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2466 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/parser.cc | 2 +- test/mjsunit/regress/regress-345.js | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-345.js diff --git a/src/parser.cc b/src/parser.cc index 89d6d5b..a5ccb3f 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -2367,7 +2367,7 @@ TryStatement* Parser::ParseTryStatement(bool* ok) { result = NEW(TryFinally(try_block, finally_block)); // Add the jump targets of the try block and the catch block. for (int i = 0; i < collector.targets()->length(); i++) { - catch_collector.targets()->Add(collector.targets()->at(i)); + catch_collector.AddTarget(collector.targets()->at(i)); } result->set_escaping_targets(catch_collector.targets()); } diff --git a/test/mjsunit/regress/regress-345.js b/test/mjsunit/regress/regress-345.js new file mode 100644 index 0000000..f7f28a1 --- /dev/null +++ b/test/mjsunit/regress/regress-345.js @@ -0,0 +1,51 @@ +// Copyright 2009 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. + +// Escaping to the same target from both the try and catch blocks of +// try...catch...finally should not fail at compile-time. +// +// Reported by nth10sd. +// See http://code.google.com/p/v8/issues/detail?id=345 + +do { + try { + continue; + } catch (e) { + continue; + } finally { + } +} while (false); + + +L: { + try { + break L; + } catch (e) { + break L; + } finally { + } +} -- 2.7.4