<!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>[180639] 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/180639">180639</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-25 14:32:58 -0800 (Wed, 25 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CodeBlock crashes when dumping op_push_name_scope
https://bugs.webkit.org/show_bug.cgi?id=141953
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-02-25
PerformanceTests/SunSpider:
Reviewed by Filip Pizlo.
* profiler-test.yaml:
Source/JavaScriptCore:
Reviewed by Filip Pizlo and Csaba Osztrogonác.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
* tests/stress/op-push-name-scope-crashes-profiler.js: Added.
Tools:
Reviewed by Filip Pizlo.
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsSunSpiderChangeLog">trunk/PerformanceTests/SunSpider/ChangeLog</a></li>
<li><a href="#trunkPerformanceTestsSunSpiderprofilertestyaml">trunk/PerformanceTests/SunSpider/profiler-test.yaml</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="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressoppushnamescopecrashesprofilerjs">trunk/Source/JavaScriptCore/tests/stress/op-push-name-scope-crashes-profiler.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsSunSpiderChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/SunSpider/ChangeLog (180638 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/SunSpider/ChangeLog 2015-02-25 22:32:45 UTC (rev 180638)
+++ trunk/PerformanceTests/SunSpider/ChangeLog 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-02-25 Benjamin Poulain <bpoulain@apple.com>
+
+ CodeBlock crashes when dumping op_push_name_scope
+ https://bugs.webkit.org/show_bug.cgi?id=141953
+
+ Reviewed by Filip Pizlo.
+
+ * profiler-test.yaml:
+
</ins><span class="cx"> 2015-01-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] JSC profiler tests asserts in debug mode
</span></span></pre></div>
<a id="trunkPerformanceTestsSunSpiderprofilertestyaml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/SunSpider/profiler-test.yaml (180638 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/SunSpider/profiler-test.yaml 2015-02-25 22:32:45 UTC (rev 180638)
+++ trunk/PerformanceTests/SunSpider/profiler-test.yaml 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -25,9 +25,4 @@
</span><span class="cx"> # with the runProfiler command.
</span><span class="cx">
</span><span class="cx"> - path: tests/sunspider-1.0
</span><del>- cmd: |
- if ($architecture !~ /x86/i and $hostOS == "darwin") or ($hostOS == "windows")
- skip
- else
- runProfiler
- end
</del><ins>+ cmd: runProfiler
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180638 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-25 22:32:45 UTC (rev 180638)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-02-25 Benjamin Poulain <bpoulain@apple.com>
+
+ CodeBlock crashes when dumping op_push_name_scope
+ https://bugs.webkit.org/show_bug.cgi?id=141953
+
+ Reviewed by Filip Pizlo and Csaba Osztrogonác.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ * tests/stress/op-push-name-scope-crashes-profiler.js: Added.
+
</ins><span class="cx"> 2015-02-25 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make ParserError immutable by design
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (180638 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-02-25 22:32:45 UTC (rev 180638)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -1445,12 +1445,11 @@
</span><span class="cx"> }
</span><span class="cx"> case op_push_name_scope: {
</span><span class="cx"> int dst = (++it)->u.operand;
</span><del>- int id0 = (++it)->u.operand;
</del><span class="cx"> int r1 = (++it)->u.operand;
</span><del>- unsigned attributes = (++it)->u.operand;
</del><ins>+ int k0 = (++it)->u.operand;
</ins><span class="cx"> JSNameScope::Type scopeType = (JSNameScope::Type)(++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "push_name_scope");
</span><del>- out.printf("%s, %s, %s, %u %s", registerName(dst).data(), idName(id0, identifier(id0)).data(), registerName(r1).data(), attributes, (scopeType == JSNameScope::FunctionNameScope) ? "functionScope" : ((scopeType == JSNameScope::CatchScope) ? "catchScope" : "unknownScopeType"));
</del><ins>+ out.printf("%s, %s, %s, %s", registerName(dst).data(), registerName(r1).data(), constantName(k0, getConstant(k0)).data(), (scopeType == JSNameScope::FunctionNameScope) ? "functionScope" : ((scopeType == JSNameScope::CatchScope) ? "catchScope" : "unknownScopeType"));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_catch: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressoppushnamescopecrashesprofilerjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/op-push-name-scope-crashes-profiler.js (0 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op-push-name-scope-crashes-profiler.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/op-push-name-scope-crashes-profiler.js 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+//@ runProfiler
+function test() {
+ (function functionName() {
+ ++counter;
+ if (!arguments[0])
+ return;
+ eval("functionName(arguments[0] - 1, functionName, '' + functionName);");
+ })(arguments[0]);
+}
+
+for (var i = 0; i < 10000; ++i) {
+ counter = 0;
+ test(100);
+ if (counter !== 101) {
+ throw "Oops, test(100) = " + test(100) + ", expected 101.";
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180638 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-25 22:32:45 UTC (rev 180638)
+++ trunk/Tools/ChangeLog 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-02-25 Benjamin Poulain <bpoulain@apple.com>
+
+ CodeBlock crashes when dumping op_push_name_scope
+ https://bugs.webkit.org/show_bug.cgi?id=141953
+
+ Reviewed by Filip Pizlo.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2015-02-25 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> W3C test importer should use argparse instead of optparse
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (180638 => 180639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-25 22:32:45 UTC (rev 180638)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-02-25 22:32:58 UTC (rev 180639)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runProfiler
</span><del>- if $remote
</del><ins>+ if $remote or ($architecture !~ /x86/i and $hostOS == "darwin") or ($hostOS == "windows")
</ins><span class="cx"> skip
</span><span class="cx"> return
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>