<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177460] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177460">177460</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 13:38:43 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tests with infinite recursion frequently crash
https://bugs.webkit.org/show_bug.cgi?id=139548
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
While unwinding, if the call frame doesn't have a codeblock, then we
are in native code, handle appropriately.
* interpreter/Interpreter.cpp:
(JSC::unwindCallFrame):
(JSC::UnwindFunctor::operator()):
Added checks for null CodeBlock.
(JSC::Interpreter::unwind): Removed wrong ASSERT.
LayoutTests:
New test that exercises the various places that we do stack overflow checks.
* TestExpectations:
* js/regress-139548-expected.txt: Added.
* js/regress-139548.html: Added.
* js/script-tests/regress-139548.js: Added.
(ToStringObj):
(ToStringObj.prototype.toString):
(makeArgsArray):
(recurseNoDFG):
(recurse):
(probeAndRecurse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress139548expectedtxt">trunk/LayoutTests/js/regress-139548-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress139548html">trunk/LayoutTests/js/regress-139548.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress139548js">trunk/LayoutTests/js/script-tests/regress-139548.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177459 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-17 21:19:21 UTC (rev 177459)
+++ trunk/LayoutTests/ChangeLog 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-17 Michael Saboff <msaboff@apple.com>
+
+ Tests with infinite recursion frequently crash
+ https://bugs.webkit.org/show_bug.cgi?id=139548
+
+ Reviewed by Geoffrey Garen.
+
+ New test that exercises the various places that we do stack overflow checks.
+
+ * TestExpectations:
+ * js/regress-139548-expected.txt: Added.
+ * js/regress-139548.html: Added.
+ * js/script-tests/regress-139548.js: Added.
+ (ToStringObj):
+ (ToStringObj.prototype.toString):
+ (makeArgsArray):
+ (recurseNoDFG):
+ (recurse):
+ (probeAndRecurse):
+
</ins><span class="cx"> 2014-12-16 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> text node should not be created, On setting document.title to the empty string.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (177459 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-12-17 21:19:21 UTC (rev 177459)
+++ trunk/LayoutTests/TestExpectations 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -324,10 +324,6 @@
</span><span class="cx"> [ Debug ] fast/history/history-back-while-pdf-in-pagecache.html [ Skip ]
</span><span class="cx"> webkit.org/b/121628 [ Release ] fast/history/history-back-while-pdf-in-pagecache.html [ Pass ImageOnlyFailure ]
</span><span class="cx">
</span><del>-# Catching infinite recursion is broken.
-webkit.org/b/139548 fast/workers/worker-constructor.html [ Skip ]
-webkit.org/b/139548 fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html [ Skip ]
-
</del><span class="cx"> # Network process disk cache is not enabled yet
</span><span class="cx"> webkit.org/b/30322 http/tests/cache/disk-cache-validation.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress139548expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-139548-expected.txt (0 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-139548-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-139548-expected.txt 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Regression test for https://webkit.org/b/139548. This test should not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress139548html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-139548.html (0 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-139548.html (rev 0)
+++ trunk/LayoutTests/js/regress-139548.html 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-139548.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress139548js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-139548.js (0 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-139548.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-139548.js 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+description("Regression test for https://webkit.org/b/139548. This test should not crash.");
+
+var maxArgCount = 8;
+var argIncrement = 1;
+
+function ToStringObj()
+{
+ s: ""
+}
+
+// Want a function that a native C++ function can call.
+ToStringObj.prototype.toString = function() { this.s = new String(""); return this.s; };
+
+var myObj = new ToStringObj();
+
+function makeArgsArray(firstArg, argCount)
+{
+ var args = [firstArg];
+ for (var argIndex = 1; argIndex < argCount; argIndex++)
+ args.push(argIndex);
+
+ return args;
+}
+
+function recurseNoDFG(depth)
+{
+ var s = "";
+ if (depth <= 0)
+ return 0;
+
+ for (var i = 1; i < maxArgCount; i += argIncrement) {
+ try {
+ s = myObj.toLocaleString();
+ return recurseNoDFG.apply(this, makeArgsArray(depth - 1, i));
+ } catch (e) {
+ if (e instanceof String)
+ throw e;
+
+ for (var j = 1; j < maxArgCount; j += argIncrement) {
+ try {
+ s = myObj.toLocaleString();
+ recurseNoDFG.apply(this, makeArgsArray(depth - 1, j)) + 1;
+ } catch (e1) {
+ }
+ }
+
+ throw "Got an exception";
+ }
+ }
+ return s.length;
+}
+
+function recurse(depth)
+{
+ var s = "";
+
+ if (depth <= 0)
+ return 0;
+
+ for (var i = 1; i < maxArgCount; i += argIncrement) {
+ s = myObj.toLocaleString();
+ return recurse.apply(this, makeArgsArray(depth - 1, i));
+ }
+
+ return s.length;
+}
+
+function probeAndRecurse(depth)
+{
+ var result;
+
+ // Probe stack depth
+ try {
+ result = probeAndRecurse(depth);
+ if (result == 0)
+ depth = 50;
+ else if (result < 0)
+ return result + 1;
+ else
+ return result;
+ } catch (e) {
+ // Go up a several frames and then call recursive functions that consume
+ // variable stack amounts in an effort to exercise various stack checks.
+ return -6;
+ }
+
+ for (var i = 1; i < maxArgCount; i += argIncrement) {
+ try {
+ recurseNoDFG.apply(this, makeArgsArray(depth, i));
+ } catch (e) {
+ }
+ }
+
+ for (var i = 1; i < maxArgCount; i += argIncrement) {
+ try {
+ recurse.apply(this, makeArgsArray(depth, i));
+ } catch (e) {
+ }
+ }
+
+ return 1;
+}
+
+// Warm up recurse functions
+for (var loopCount = 0; loopCount < 5000; loopCount++)
+ recurse(10);
+
+probeAndRecurse(0);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (177459 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-17 21:19:21 UTC (rev 177459)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-17 Michael Saboff <msaboff@apple.com>
+
+ Tests with infinite recursion frequently crash
+ https://bugs.webkit.org/show_bug.cgi?id=139548
+
+ Reviewed by Geoffrey Garen.
+
+ While unwinding, if the call frame doesn't have a codeblock, then we
+ are in native code, handle appropriately.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::unwindCallFrame):
+ (JSC::UnwindFunctor::operator()):
+ Added checks for null CodeBlock.
+
+ (JSC::Interpreter::unwind): Removed wrong ASSERT.
+
</ins><span class="cx"> 2014-12-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Make it possible to toggle FeatureCounter support at runtime
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (177459 => 177460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2014-12-17 21:19:21 UTC (rev 177459)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2014-12-17 21:38:43 UTC (rev 177460)
</span><span class="lines">@@ -436,7 +436,6 @@
</span><span class="cx"> static bool unwindCallFrame(StackVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> CallFrame* callFrame = visitor->callFrame();
</span><del>- CodeBlock* codeBlock = visitor->codeBlock();
</del><span class="cx"> if (Debugger* debugger = callFrame->vmEntryGlobalObject()->debugger()) {
</span><span class="cx"> ClearExceptionScope scope(&callFrame->vm());
</span><span class="cx"> if (jsDynamicCast<JSFunction*>(callFrame->callee()))
</span><span class="lines">@@ -446,20 +445,22 @@
</span><span class="cx"> ASSERT(!callFrame->hadException());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (codeBlock->codeType() == FunctionCode && codeBlock->needsActivation()) {
</del><ins>+ if (CodeBlock* codeBlock = visitor->codeBlock()) {
+ if (codeBlock->codeType() == FunctionCode && codeBlock->needsActivation()) {
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- RELEASE_ASSERT(!visitor->isInlinedFrame());
</del><ins>+ RELEASE_ASSERT(!visitor->isInlinedFrame());
</ins><span class="cx"> #endif
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><del>- if (codeBlock->codeType() == FunctionCode && codeBlock->usesArguments()) {
- if (Arguments* arguments = visitor->existingArguments()) {
</del><ins>+ if (codeBlock->codeType() == FunctionCode && codeBlock->usesArguments()) {
+ if (Arguments* arguments = visitor->existingArguments()) {
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- if (visitor->isInlinedFrame())
- arguments->tearOff(callFrame, visitor->inlineCallFrame());
- else
</del><ins>+ if (visitor->isInlinedFrame())
+ arguments->tearOff(callFrame, visitor->inlineCallFrame());
+ else
</ins><span class="cx"> #endif
</span><del>- arguments->tearOff(callFrame);
</del><ins>+ arguments->tearOff(callFrame);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -646,7 +647,7 @@
</span><span class="cx"> m_codeBlock = visitor->codeBlock();
</span><span class="cx"> unsigned bytecodeOffset = visitor->bytecodeOffset();
</span><span class="cx">
</span><del>- if (m_isTermination || !(m_handler = m_codeBlock->handlerForBytecodeOffset(bytecodeOffset))) {
</del><ins>+ if (m_isTermination || !(m_handler = m_codeBlock ? m_codeBlock->handlerForBytecodeOffset(bytecodeOffset) : nullptr)) {
</ins><span class="cx"> if (!unwindCallFrame(visitor)) {
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->exceptionUnwind(m_callFrame);
</span><span class="lines">@@ -669,7 +670,6 @@
</span><span class="cx"> NEVER_INLINE HandlerInfo* Interpreter::unwind(VMEntryFrame*& vmEntryFrame, CallFrame*& callFrame, JSValue& exceptionValue)
</span><span class="cx"> {
</span><span class="cx"> CodeBlock* codeBlock = callFrame->codeBlock();
</span><del>- ASSERT(codeBlock);
</del><span class="cx"> bool isTermination = false;
</span><span class="cx">
</span><span class="cx"> ASSERT(!exceptionValue.isEmpty());
</span></span></pre>
</div>
</div>
</body>
</html>