<!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>[197888] trunk/Source/JavaScriptCore</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/197888">197888</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-09 14:34:08 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/197873">r197873</a>.
https://bugs.webkit.org/show_bug.cgi?id=155262
"Crashes some JSC tests" (Requested by mlam on #webkit).
Reverted changeset:
"Add dumping of function expression names in CodeBlock
bytecode dump."
https://bugs.webkit.org/show_bug.cgi?id=155248
http://trac.webkit.org/changeset/197873</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197887 => 197888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-09 22:29:33 UTC (rev 197887)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-09 22:34:08 UTC (rev 197888)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-09 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r197873.
+ https://bugs.webkit.org/show_bug.cgi?id=155262
+
+ "Crashes some JSC tests" (Requested by mlam on #webkit).
+
+ Reverted changeset:
+
+ "Add dumping of function expression names in CodeBlock
+ bytecode dump."
+ https://bugs.webkit.org/show_bug.cgi?id=155248
+ http://trac.webkit.org/changeset/197873
+
</ins><span class="cx"> 2016-03-09 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix old iOS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (197887 => 197888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-03-09 22:29:33 UTC (rev 197887)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-03-09 22:34:08 UTC (rev 197888)
</span><span class="lines">@@ -769,19 +769,6 @@
</span><span class="cx"> out.printf("%s", registerName(operand).data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CodeBlock::dumpFunctionExpr(PrintStream& out, int funcExprIndex)
-{
- out.printf("f%d", funcExprIndex);
- if (!isCompilationThread()) {
- FunctionExecutable* executable = functionExpr(funcExprIndex);
- String name = executable->inferredName().string();
- if (name.isEmpty())
- out.print(":<anon>");
- else
- out.print(":", name.utf8());
- }
-}
-
</del><span class="cx"> void CodeBlock::dumpBytecode(
</span><span class="cx"> PrintStream& out, ExecState* exec, const Instruction* begin, const Instruction*& it,
</span><span class="cx"> const StubInfoMap& stubInfos, const CallLinkInfoMap& callLinkInfos)
</span><span class="lines">@@ -1349,8 +1336,7 @@
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "new_func");
</span><del>- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
</del><ins>+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_new_generator_func: {
</span><span class="lines">@@ -1358,8 +1344,7 @@
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "new_generator_func");
</span><del>- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
</del><ins>+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_new_arrow_func_exp: {
</span><span class="lines">@@ -1367,8 +1352,7 @@
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "op_new_arrow_func_exp");
</span><del>- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
</del><ins>+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_new_func_exp: {
</span><span class="lines">@@ -1376,8 +1360,7 @@
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "new_func_exp");
</span><del>- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
</del><ins>+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_new_generator_func_exp: {
</span><span class="lines">@@ -1385,8 +1368,7 @@
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "new_generator_func_exp");
</span><del>- out.printf("%s, %s", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
</del><ins>+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_call: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (197887 => 197888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-03-09 22:29:33 UTC (rev 197887)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-03-09 22:34:08 UTC (rev 197888)
</span><span class="lines">@@ -958,7 +958,6 @@
</span><span class="cx"> m_constantRegisters[index - FirstConstantRegisterIndex].set(m_globalObject->vm(), this, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void dumpFunctionExpr(PrintStream&, int funcExprIndex);
</del><span class="cx"> void dumpBytecode(
</span><span class="cx"> PrintStream&, ExecState*, const Instruction* begin, const Instruction*&,
</span><span class="cx"> const StubInfoMap& = StubInfoMap(), const CallLinkInfoMap& = CallLinkInfoMap());
</span></span></pre>
</div>
</div>
</body>
</html>