<!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>[166440] 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/166440">166440</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 17:37:10 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mandreel throws a checksum error on 32-bit x86.
<https://webkit.org/b/125706>
Reviewed by Filip Pizlo.
The 32-bit DFG can emit code that loads double constants from its
CodeBlock's m_constantRegisters vector. The emitted instruction will
embed the address of the constant from the vector's backing store.
Subsequently, while inserting new constants, the DFG may resize the
vector, thereby reallocating the backing store. This renders the
previously embedded constant addresses stale.
The fix is to use a dedicated doubles constant pool stored in the DFG
CommonData instead. This constant pool won't be reallocated, and
hence will not manifest this issue.
* dfg/DFGCommonData.h:
* dfg/DFGGraph.h:
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::link):
(JSC::DFG::JITCompiler::addressOfDoubleConstant):
* dfg/DFGJITCompiler.h:
(JSC::DFG::JITCompiler::addressOfDoubleConstant): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonDatah">trunk/Source/JavaScriptCore/dfg/DFGCommonData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCompilerh">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166439 => 166440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-29 00:30:39 UTC (rev 166439)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-29 00:37:10 UTC (rev 166440)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-03-28 Mark Lam <mark.lam@apple.com>
+
+ mandreel throws a checksum error on 32-bit x86.
+ <https://webkit.org/b/125706>
+
+ Reviewed by Filip Pizlo.
+
+ The 32-bit DFG can emit code that loads double constants from its
+ CodeBlock's m_constantRegisters vector. The emitted instruction will
+ embed the address of the constant from the vector's backing store.
+ Subsequently, while inserting new constants, the DFG may resize the
+ vector, thereby reallocating the backing store. This renders the
+ previously embedded constant addresses stale.
+
+ The fix is to use a dedicated doubles constant pool stored in the DFG
+ CommonData instead. This constant pool won't be reallocated, and
+ hence will not manifest this issue.
+
+ * dfg/DFGCommonData.h:
+ * dfg/DFGGraph.h:
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::link):
+ (JSC::DFG::JITCompiler::addressOfDoubleConstant):
+ * dfg/DFGJITCompiler.h:
+ (JSC::DFG::JITCompiler::addressOfDoubleConstant): Deleted.
+
</ins><span class="cx"> 2014-03-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: console.warn is showing as error instead of warning
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommonData.h (166439 => 166440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2014-03-29 00:30:39 UTC (rev 166439)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2014-03-29 00:37:10 UTC (rev 166440)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "ProfiledCodeBlockJettisoningWatchpoint.h"
</span><span class="cx"> #include "ProfilerCompilation.h"
</span><span class="cx"> #include "SymbolTable.h"
</span><ins>+#include <wtf/Bag.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -105,6 +106,10 @@
</span><span class="cx">
</span><span class="cx"> int machineCaptureStart;
</span><span class="cx"> std::unique_ptr<SlowArgument[]> slowArguments;
</span><ins>+
+#if USE(JSVALUE32_64)
+ std::unique_ptr<Bag<double>> doubleConstants;
+#endif
</ins><span class="cx">
</span><span class="cx"> unsigned frameRegisterCount;
</span><span class="cx"> unsigned requiredRegisterCountForExit;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (166439 => 166440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-03-29 00:30:39 UTC (rev 166439)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-03-29 00:37:10 UTC (rev 166440)
</span><span class="lines">@@ -846,6 +846,11 @@
</span><span class="cx"> unsigned m_parameterSlots;
</span><span class="cx"> int m_machineCaptureStart;
</span><span class="cx"> std::unique_ptr<SlowArgument[]> m_slowArguments;
</span><ins>+
+#if USE(JSVALUE32_64)
+ HashMap<double, double*> m_doubleConstantsMap;
+ std::unique_ptr<Bag<double>> m_doubleConstants;
+#endif
</ins><span class="cx">
</span><span class="cx"> OptimizationFixpointState m_fixpointState;
</span><span class="cx"> GraphForm m_form;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (166439 => 166440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2014-03-29 00:30:39 UTC (rev 166439)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2014-03-29 00:37:10 UTC (rev 166440)
</span><span class="lines">@@ -159,6 +159,10 @@
</span><span class="cx"> m_jitCode->common.machineCaptureStart = m_graph.m_machineCaptureStart;
</span><span class="cx"> m_jitCode->common.slowArguments = std::move(m_graph.m_slowArguments);
</span><span class="cx">
</span><ins>+#if USE(JSVALUE32_64)
+ m_jitCode->common.doubleConstants = std::move(m_graph.m_doubleConstants);
+#endif
+
</ins><span class="cx"> BitVector usedJumpTables;
</span><span class="cx"> for (Bag<SwitchData>::iterator iter = m_graph.m_switchData.begin(); !!iter; ++iter) {
</span><span class="cx"> SwitchData& data = **iter;
</span><span class="lines">@@ -432,6 +436,28 @@
</span><span class="cx"> m_disassembler->reportToProfiler(m_graph.m_plan.compilation.get(), linkBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(JSVALUE32_64)
+void* JITCompiler::addressOfDoubleConstant(Node* node)
+{
+ ASSERT(m_graph.isNumberConstant(node));
+ JSValue jsvalue = node->valueOfJSConstant(codeBlock());
+ ASSERT(jsvalue.isDouble());
+
+ double value = jsvalue.asDouble();
+ auto it = m_graph.m_doubleConstantsMap.find(value);
+ if (it != m_graph.m_doubleConstantsMap.end())
+ return it->value;
+
+ if (!m_graph.m_doubleConstants)
+ m_graph.m_doubleConstants = std::make_unique<Bag<double>>();
+
+ double* addressInConstantPool = m_graph.m_doubleConstants->add();
+ *addressInConstantPool = value;
+ m_graph.m_doubleConstantsMap.add(value, addressInConstantPool);
+ return addressInConstantPool;
+}
+#endif
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h (166439 => 166440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h 2014-03-29 00:30:39 UTC (rev 166439)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h 2014-03-29 00:37:10 UTC (rev 166440)
</span><span class="lines">@@ -198,12 +198,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(JSVALUE32_64)
</span><del>- void* addressOfDoubleConstant(Node* node)
- {
- ASSERT(m_graph.isNumberConstant(node));
- unsigned constantIndex = node->constantNumber();
- return &(codeBlock()->constantRegister(FirstConstantRegisterIndex + constantIndex));
- }
</del><ins>+ void* addressOfDoubleConstant(Node*);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void addGetById(const JITGetByIdGenerator& gen, SlowPathGenerator* slowPath)
</span></span></pre>
</div>
</div>
</body>
</html>