Reviewers: Kevin Millikin,
Description:
Make throw inlineable only if the exception is inlineable.
BUG=1337
TEST=regress-1337
Please review this at http://codereview.chromium.org/6881079/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/ast.cc
A test/mjsunit/regress/regress-1337.js
Index: src/ast.cc
diff --git a/src/ast.cc b/src/ast.cc
index
303189d096051d5b1edae4b55a329b965e1e51ac..6422f9a1135671e1d4884a021a210d987f1100ab
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();
}
Index: test/mjsunit/regress/regress-1337.js
diff --git a/test/mjsunit/regress/regress-1337.js
b/test/mjsunit/regress/regress-1337.js
new file mode 100644
index
0000000000000000000000000000000000000000..29c4e9d0492ab4e86c36e9361f4d4fca6ac6dfa5
--- /dev/null
+++ b/test/mjsunit/regress/regress-1337.js
@@ -0,0 +1,36 @@
+// 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.
+
+// Test that the throw is not inlined if object literals cannot be
+// inlined.
+function bar() { throw {}; }
+
+function foo() { bar(); }
+
+for (var i = 0; i < 100000; ++i) {
+ try { foo() } catch (e) { }
+}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
