From 3b6fe22c4de965d2469adfd31a2fbdae7d109a09 Mon Sep 17 00:00:00 2001 From: "karlklose@chromium.org" Date: Wed, 20 Apr 2011 09:15:52 +0000 Subject: [PATCH] Make throw inlineable only if the exception is inlineable. BUG=1337 TEST=regress-1337 Review URL: http://codereview.chromium.org/6881079 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7671 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ast.cc | 2 +- test/mjsunit/regress/regress-1337.js | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-1337.js diff --git a/src/ast.cc b/src/ast.cc index 303189d..6422f9a 100644 --- a/src/ast.cc +++ b/src/ast.cc @@ -413,7 +413,7 @@ bool DebuggerStatement::IsInlineable() const { bool Throw::IsInlineable() const { - return true; + return exception()->IsInlineable(); } diff --git a/test/mjsunit/regress/regress-1337.js b/test/mjsunit/regress/regress-1337.js new file mode 100644 index 0000000..ebcf84b --- /dev/null +++ b/test/mjsunit/regress/regress-1337.js @@ -0,0 +1,40 @@ +// Copyright 2011 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 + +// Test that the throw is not inlined if object literals cannot be +// inlined. +function bar() { throw {}; } + +function foo() { bar(); } + +for (var i = 0; i < 5; ++i) { + try { foo() } catch (e) { } +} +%OptimizeFunctionOnNextCall(foo) +try { foo() } catch (e) { } -- 2.7.4