Reviewers: Kevin Millikin, Description: Enable inlining functions containing throw.
After Kevin's change to the graph builder to allow aborting graph construction
inside arbitrary expressions this just works. BUG=v8:1143 Please review this at http://codereview.chromium.org/6839017/ SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/ast.cc A test/mjsunit/compiler/inline-throw.js Index: src/ast.cc =================================================================== --- src/ast.cc (revision 7604) +++ src/ast.cc (working copy) @@ -413,8 +413,7 @@ bool Throw::IsInlineable() const { - // TODO(1143): Make functions containing throw inlineable. - return false; + return true; } Index: test/mjsunit/compiler/inline-throw.js =================================================================== --- test/mjsunit/compiler/inline-throw.js (revision 0) +++ test/mjsunit/compiler/inline-throw.js (revision 0) @@ -0,0 +1,69 @@ +// Copyright 2010 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 inlined functions contain throw. +function doThrow() { + throw "uha"; +} + +function f(x) { + if (x == 42) throw doThrow(); + if (x == 43) throw "wow"; + return x == 0; +} + +function g(x) { + return f(x); +} + +for (var i = 0; i < 5; i++) g(0); +%OptimizeFunctionOnNextCall(g); +assertEquals(true, g(0)); + +try { + g(42); +} catch(e) { + assertEquals("uha", e); +} + +// Test inlining in a test context. +function h(x) { + return f(x) ? "yes" : "no"; +} + +for (var i = 0; i < 5; i++) h(0); +%OptimizeFunctionOnNextCall(h); +assertEquals("yes", h(0)); + +try { + h(43); +} catch(e) { + assertEquals("wow", e); +} + Property changes on: test/mjsunit/compiler/inline-throw.js ___________________________________________________________________ Added: svn:eol-style + LF -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
