<!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>[183067] 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/183067">183067</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 10:57:15 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in JSC::Interpreter::execute
https://bugs.webkit.org/show_bug.cgi?id=142625
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
We need to keep the FunctionExecutables in the code block for the eval flavor of
Interpreter::execute() in order to create the scope used to eval.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::jettisonFunctionDeclsAndExprs): Deleted.
* bytecode/CodeBlock.h:
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::registerFrozenValues):
LayoutTests:
New regression test.
* js/regress-142625-expected.txt: Added.
* js/regress-142625.html: Added.
* js/script-tests/regress-142625.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress142625expectedtxt">trunk/LayoutTests/js/regress-142625-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress142625html">trunk/LayoutTests/js/regress-142625.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress142625js">trunk/LayoutTests/js/script-tests/regress-142625.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183066 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-21 17:11:44 UTC (rev 183066)
+++ trunk/LayoutTests/ChangeLog 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-21 Michael Saboff <msaboff@apple.com>
+
+ Crash in JSC::Interpreter::execute
+ https://bugs.webkit.org/show_bug.cgi?id=142625
+
+ Reviewed by Filip Pizlo.
+
+ New regression test.
+
+ * js/regress-142625-expected.txt: Added.
+ * js/regress-142625.html: Added.
+ * js/script-tests/regress-142625.js: Added.
+
</ins><span class="cx"> 2015-04-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r177494): -webkit-mask-image: with data URI fails on non-local files
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress142625expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-142625-expected.txt (0 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-142625-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-142625-expected.txt 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regression test for https://webkit.org/b/142625. This test should not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Eval of DFG compiled function didn't crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress142625html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-142625.html (0 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-142625.html (rev 0)
+++ trunk/LayoutTests/js/regress-142625.html 2015-04-21 17:57:15 UTC (rev 183067)
</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-142625.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress142625js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-142625.js (0 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-142625.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-142625.js 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+description("Regression test for https://webkit.org/b/142625. This test should not crash.");
+
+for (var i = 0; i < 10000; i++)
+ eval("function fuzz() {}");
+
+testPassed("Eval of DFG compiled function didn't crash");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183066 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-21 17:11:44 UTC (rev 183066)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-21 Michael Saboff <msaboff@apple.com>
+
+ Crash in JSC::Interpreter::execute
+ https://bugs.webkit.org/show_bug.cgi?id=142625
+
+ Reviewed by Filip Pizlo.
+
+ We need to keep the FunctionExecutables in the code block for the eval flavor of
+ Interpreter::execute() in order to create the scope used to eval.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::jettisonFunctionDeclsAndExprs): Deleted.
+ * bytecode/CodeBlock.h:
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::registerFrozenValues):
+
</ins><span class="cx"> 2015-04-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make Vector(const Vector<T, otherCapacity, otherOverflowBehaviour>&) constructor explicit
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (183066 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-04-21 17:11:44 UTC (rev 183066)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -2936,12 +2936,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CodeBlock::jettisonFunctionDeclsAndExprs()
-{
- m_functionDecls.clear();
- m_functionExprs.clear();
-}
-
</del><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> void CodeBlock::unlinkCalls()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (183066 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-04-21 17:11:44 UTC (rev 183066)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -599,8 +599,6 @@
</span><span class="cx"> int numberOfFunctionDecls() { return m_functionDecls.size(); }
</span><span class="cx"> FunctionExecutable* functionExpr(int index) { return m_functionExprs[index].get(); }
</span><span class="cx">
</span><del>- void jettisonFunctionDeclsAndExprs();
-
</del><span class="cx"> RegExp* regexp(int index) const { return m_unlinkedCode->regexp(index); }
</span><span class="cx">
</span><span class="cx"> unsigned numberOfConstantBuffers() const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (183066 => 183067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-04-21 17:11:44 UTC (rev 183066)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-04-21 17:57:15 UTC (rev 183067)
</span><span class="lines">@@ -1126,10 +1126,6 @@
</span><span class="cx"> }
</span><span class="cx"> m_codeBlock->constants().shrinkToFit();
</span><span class="cx"> m_codeBlock->constantsSourceCodeRepresentation().shrinkToFit();
</span><del>-
- // We have no use DFG IR have no need for FunctionExecutable*'s in the CodeBlock, since we
- // use frozen values to refer to them.
- m_codeBlock->jettisonFunctionDeclsAndExprs();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Graph::visitChildren(SlotVisitor& visitor)
</span></span></pre>
</div>
</div>
</body>
</html>