<!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>[161446] 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/161446">161446</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-01-07 12:47:50 -0800 (Tue, 07 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://trac.webkit.org/projects/webkit/changeset/161364">r161364</a> caused JSC tests regression on non-DFG builds (e.g. C Loop and Windows).
https://bugs.webkit.org/show_bug.cgi?id=126589.
Reviewed by Filip Pizlo.
After the removal of ENABLE(VALUE_PROFILER), the LLINT is now expecting the
relevant opcode operands to point to ValueProfiler data structures and will
write profiling data into them. Hence, we need to allocate these data
structures even though the profiling data won't be used in non-DFG builds.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161445 => 161446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-07 20:16:37 UTC (rev 161445)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-07 20:47:50 UTC (rev 161446)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-07 Mark Lam <mark.lam@apple.com>
+
+ r161364 caused JSC tests regression on non-DFG builds (e.g. C Loop and Windows).
+ https://bugs.webkit.org/show_bug.cgi?id=126589.
+
+ Reviewed by Filip Pizlo.
+
+ After the removal of ENABLE(VALUE_PROFILER), the LLINT is now expecting the
+ relevant opcode operands to point to ValueProfiler data structures and will
+ write profiling data into them. Hence, we need to allocate these data
+ structures even though the profiling data won't be used in non-DFG builds.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+
</ins><span class="cx"> 2014-01-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT in compileArithNegate on pdfjs
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (161445 => 161446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-07 20:16:37 UTC (rev 161445)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-07 20:47:50 UTC (rev 161446)
</span><span class="lines">@@ -1644,14 +1644,12 @@
</span><span class="cx"> if (size_t size = unlinkedCodeBlock->numberOfLLintCallLinkInfos())
</span><span class="cx"> m_llintCallLinkInfos.resizeToFit(size);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(DFG_JIT)
</del><span class="cx"> if (size_t size = unlinkedCodeBlock->numberOfArrayProfiles())
</span><span class="cx"> m_arrayProfiles.grow(size);
</span><span class="cx"> if (size_t size = unlinkedCodeBlock->numberOfArrayAllocationProfiles())
</span><span class="cx"> m_arrayAllocationProfiles.resizeToFit(size);
</span><span class="cx"> if (size_t size = unlinkedCodeBlock->numberOfValueProfiles())
</span><span class="cx"> m_valueProfiles.resizeToFit(size);
</span><del>-#endif
</del><span class="cx"> if (size_t size = unlinkedCodeBlock->numberOfObjectAllocationProfiles())
</span><span class="cx"> m_objectAllocationProfiles.resizeToFit(size);
</span><span class="cx">
</span><span class="lines">@@ -1668,7 +1666,6 @@
</span><span class="cx"> instructions[i + j].u.operand = pc[i + j].u.operand;
</span><span class="cx"> }
</span><span class="cx"> switch (pc[i].u.opcode) {
</span><del>-#if ENABLE(DFG_JIT)
</del><span class="cx"> case op_get_by_val:
</span><span class="cx"> case op_get_argument_by_val: {
</span><span class="cx"> int arrayProfileIndex = pc[i + opLength - 2].u.operand;
</span><span class="lines">@@ -1705,7 +1702,6 @@
</span><span class="cx"> instructions[i + opLength - 1] = &m_arrayAllocationProfiles[arrayAllocationProfileIndex];
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> case op_new_object: {
</span><span class="cx"> int objectAllocationProfileIndex = pc[i + opLength - 1].u.operand;
</span><span class="cx"> ObjectAllocationProfile* objectAllocationProfile = &m_objectAllocationProfiles[objectAllocationProfileIndex];
</span><span class="lines">@@ -1719,7 +1715,6 @@
</span><span class="cx">
</span><span class="cx"> case op_call:
</span><span class="cx"> case op_call_eval: {
</span><del>-#if ENABLE(DFG_JIT)
</del><span class="cx"> ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand];
</span><span class="cx"> ASSERT(profile->m_bytecodeOffset == -1);
</span><span class="cx"> profile->m_bytecodeOffset = i;
</span><span class="lines">@@ -1727,7 +1722,6 @@
</span><span class="cx"> int arrayProfileIndex = pc[i + opLength - 2].u.operand;
</span><span class="cx"> m_arrayProfiles[arrayProfileIndex] = ArrayProfile(i);
</span><span class="cx"> instructions[i + opLength - 2] = &m_arrayProfiles[arrayProfileIndex];
</span><del>-#endif
</del><span class="cx"> #if ENABLE(LLINT)
</span><span class="cx"> instructions[i + 5] = &m_llintCallLinkInfos[pc[i + 5].u.operand];
</span><span class="cx"> #endif
</span><span class="lines">@@ -1737,12 +1731,10 @@
</span><span class="cx"> #if ENABLE(LLINT)
</span><span class="cx"> instructions[i + 5] = &m_llintCallLinkInfos[pc[i + 5].u.operand];
</span><span class="cx"> #endif
</span><del>-#if ENABLE(DFG_JIT)
</del><span class="cx"> ValueProfile* profile = &m_valueProfiles[pc[i + opLength - 1].u.operand];
</span><span class="cx"> ASSERT(profile->m_bytecodeOffset == -1);
</span><span class="cx"> profile->m_bytecodeOffset = i;
</span><span class="cx"> instructions[i + opLength - 1] = profile;
</span><del>-#endif
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_get_by_id_out_of_line:
</span></span></pre>
</div>
</div>
</body>
</html>