<!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>[173793] 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/173793">173793</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-20 10:59:58 -0700 (Sat, 20 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>StorageAccessData should be referenced in a sensible way
https://bugs.webkit.org/show_bug.cgi?id=136963
Reviewed and rubber stamped by Michael Saboff.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handleGetByOffset):
(JSC::DFG::ByteCodeParser::handlePutByOffset):
(JSC::DFG::ByteCodeParser::handlePutById):
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::emitGetByOffset):
(JSC::DFG::ConstantFoldingPhase::emitPutByOffset):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::dump):
* dfg/DFGGraph.h:
* dfg/DFGNode.h:
(JSC::DFG::Node::convertToGetByOffset):
(JSC::DFG::Node::convertToPutByOffset):
(JSC::DFG::Node::storageAccessData):
(JSC::DFG::Node::storageAccessDataIndex): Deleted.
* dfg/DFGSafeToExecute.h:
(JSC::DFG::safeToExecute):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileGetByOffset):
(JSC::FTL::LowerDFGToLLVM::compilePutByOffset):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafeToExecuteh">trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-09-19 Filip Pizlo <fpizlo@apple.com>
+
+ StorageAccessData should be referenced in a sensible way
+ https://bugs.webkit.org/show_bug.cgi?id=136963
+
+ Reviewed and rubber stamped by Michael Saboff.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleGetByOffset):
+ (JSC::DFG::ByteCodeParser::handlePutByOffset):
+ (JSC::DFG::ByteCodeParser::handlePutById):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGConstantFoldingPhase.cpp:
+ (JSC::DFG::ConstantFoldingPhase::emitGetByOffset):
+ (JSC::DFG::ConstantFoldingPhase::emitPutByOffset):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::dump):
+ * dfg/DFGGraph.h:
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::convertToGetByOffset):
+ (JSC::DFG::Node::convertToPutByOffset):
+ (JSC::DFG::Node::storageAccessData):
+ (JSC::DFG::Node::storageAccessDataIndex): Deleted.
+ * dfg/DFGSafeToExecute.h:
+ (JSC::DFG::safeToExecute):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileGetByOffset):
+ (JSC::FTL::LowerDFGToLLVM::compilePutByOffset):
+
</ins><span class="cx"> 2014-09-19 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Leak of mallocs under StructureSet::OutOfLineList::create
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case GetByOffset: {
</span><del>- StorageAccessData data = m_graph.m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& data = node->storageAccessData();
</ins><span class="cx"> JSValue result = m_graph.tryGetConstantProperty(forNode(node->child2()), data.offset);
</span><span class="cx"> if (result) {
</span><span class="cx"> setConstant(node, *m_graph.freeze(result));
</span><span class="lines">@@ -1618,7 +1618,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case GetGetterSetterByOffset: {
</span><del>- StorageAccessData data = m_graph.m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& data = node->storageAccessData();
</ins><span class="cx"> JSValue result = m_graph.tryGetConstantProperty(forNode(node->child2()), data.offset);
</span><span class="cx"> if (result && jsDynamicCast<GetterSetter*>(result)) {
</span><span class="cx"> setConstant(node, *m_graph.freeze(result));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -1984,13 +1984,13 @@
</span><span class="cx"> propertyStorage = base;
</span><span class="cx"> else
</span><span class="cx"> propertyStorage = addToGraph(GetButterfly, base);
</span><del>- Node* getByOffset = addToGraph(op, OpInfo(m_graph.m_storageAccessData.size()), OpInfo(prediction), propertyStorage, base);
</del><ins>+
+ StorageAccessData* data = m_graph.m_storageAccessData.add();
+ data->offset = offset;
+ data->identifierNumber = identifierNumber;
+
+ Node* getByOffset = addToGraph(op, OpInfo(data), OpInfo(prediction), propertyStorage, base);
</ins><span class="cx">
</span><del>- StorageAccessData storageAccessData;
- storageAccessData.offset = offset;
- storageAccessData.identifierNumber = identifierNumber;
- m_graph.m_storageAccessData.append(storageAccessData);
-
</del><span class="cx"> return getByOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2001,13 +2001,13 @@
</span><span class="cx"> propertyStorage = base;
</span><span class="cx"> else
</span><span class="cx"> propertyStorage = addToGraph(GetButterfly, base);
</span><del>- Node* result = addToGraph(PutByOffset, OpInfo(m_graph.m_storageAccessData.size()), propertyStorage, base, value);
</del><span class="cx">
</span><del>- StorageAccessData storageAccessData;
- storageAccessData.offset = offset;
- storageAccessData.identifierNumber = identifier;
- m_graph.m_storageAccessData.append(storageAccessData);
-
</del><ins>+ StorageAccessData* data = m_graph.m_storageAccessData.add();
+ data->offset = offset;
+ data->identifierNumber = identifier;
+
+ Node* result = addToGraph(PutByOffset, OpInfo(data), propertyStorage, base, value);
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2215,18 +2215,17 @@
</span><span class="cx">
</span><span class="cx"> addToGraph(PutStructure, OpInfo(transition), base);
</span><span class="cx">
</span><ins>+ StorageAccessData* data = m_graph.m_storageAccessData.add();
+ data->offset = variant.offset();
+ data->identifierNumber = identifierNumber;
+
</ins><span class="cx"> addToGraph(
</span><span class="cx"> PutByOffset,
</span><del>- OpInfo(m_graph.m_storageAccessData.size()),
</del><ins>+ OpInfo(data),
</ins><span class="cx"> propertyStorage,
</span><span class="cx"> base,
</span><span class="cx"> value);
</span><span class="cx">
</span><del>- StorageAccessData storageAccessData;
- storageAccessData.offset = variant.offset();
- storageAccessData.identifierNumber = identifierNumber;
- m_graph.m_storageAccessData.append(storageAccessData);
-
</del><span class="cx"> if (m_graph.compilation())
</span><span class="cx"> m_graph.compilation()->noticeInlinedPutById();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -673,8 +673,7 @@
</span><span class="cx">
</span><span class="cx"> case GetByOffset:
</span><span class="cx"> case GetGetterSetterByOffset: {
</span><del>- unsigned identifierNumber =
- graph.m_storageAccessData[node->storageAccessDataIndex()].identifierNumber;
</del><ins>+ unsigned identifierNumber = node->storageAccessData().identifierNumber;
</ins><span class="cx"> AbstractHeap heap(NamedProperties, identifierNumber);
</span><span class="cx"> read(heap);
</span><span class="cx"> def(HeapLocation(NamedPropertyLoc, heap, node->child2()), node);
</span><span class="lines">@@ -704,8 +703,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case PutByOffset: {
</span><del>- unsigned identifierNumber =
- graph.m_storageAccessData[node->storageAccessDataIndex()].identifierNumber;
</del><ins>+ unsigned identifierNumber = node->storageAccessData().identifierNumber;
</ins><span class="cx"> AbstractHeap heap(NamedProperties, identifierNumber);
</span><span class="cx"> write(heap);
</span><span class="cx"> def(HeapLocation(NamedPropertyLoc, heap, node->child2()), node->child3().node());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -486,12 +486,11 @@
</span><span class="cx"> indexInBlock, SpecNone, GetButterfly, origin, childEdge));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- node->convertToGetByOffset(m_graph.m_storageAccessData.size(), propertyStorage);
</del><ins>+ StorageAccessData& data = *m_graph.m_storageAccessData.add();
+ data.offset = variant.offset();
+ data.identifierNumber = identifierNumber;
</ins><span class="cx">
</span><del>- StorageAccessData storageAccessData;
- storageAccessData.offset = variant.offset();
- storageAccessData.identifierNumber = identifierNumber;
- m_graph.m_storageAccessData.append(storageAccessData);
</del><ins>+ node->convertToGetByOffset(data, propertyStorage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void emitPutByOffset(unsigned indexInBlock, Node* node, const AbstractValue& baseValue, const PutByIdVariant& variant, unsigned identifierNumber)
</span><span class="lines">@@ -544,15 +543,14 @@
</span><span class="cx"> m_insertionSet.insert(indexInBlock, putStructure);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- node->convertToPutByOffset(m_graph.m_storageAccessData.size(), propertyStorage);
</del><ins>+ StorageAccessData& data = *m_graph.m_storageAccessData.add();
+ data.offset = variant.offset();
+ data.identifierNumber = identifierNumber;
+
+ node->convertToPutByOffset(data, propertyStorage);
</ins><span class="cx"> m_insertionSet.insertNode(
</span><span class="cx"> indexInBlock, SpecNone, StoreBarrier, origin,
</span><span class="cx"> Edge(node->child2().node(), KnownCellUse));
</span><del>-
- StorageAccessData storageAccessData;
- storageAccessData.offset = variant.offset();
- storageAccessData.identifierNumber = identifierNumber;
- m_graph.m_storageAccessData.append(storageAccessData);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void addBaseCheck(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> out.print(comma, FunctionExecutableDump(executable));
</span><span class="cx"> }
</span><span class="cx"> if (node->hasStorageAccessData()) {
</span><del>- StorageAccessData& storageAccessData = m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& storageAccessData = node->storageAccessData();
</ins><span class="cx"> out.print(comma, "id", storageAccessData.identifierNumber, "{", identifiers()[storageAccessData.identifierNumber], "}");
</span><span class="cx"> out.print(", ", static_cast<ptrdiff_t>(storageAccessData.offset));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -55,11 +55,6 @@
</span><span class="cx">
</span><span class="cx"> namespace DFG {
</span><span class="cx">
</span><del>-struct StorageAccessData {
- PropertyOffset offset;
- unsigned identifierNumber;
-};
-
</del><span class="cx"> struct InlineVariableData {
</span><span class="cx"> InlineCallFrame* inlineCallFrame;
</span><span class="cx"> unsigned argumentPositionStart;
</span><span class="lines">@@ -730,7 +725,7 @@
</span><span class="cx"> HashMap<EncodedJSValue, FrozenValue*, EncodedJSValueHash, EncodedJSValueHashTraits> m_frozenValueMap;
</span><span class="cx"> Bag<FrozenValue> m_frozenValues;
</span><span class="cx">
</span><del>- Vector<StorageAccessData> m_storageAccessData;
</del><ins>+ Bag<StorageAccessData> m_storageAccessData;
</ins><span class="cx"> Vector<Node*, 8> m_arguments;
</span><span class="cx"> SegmentedVector<VariableAccessData, 16> m_variableAccessData;
</span><span class="cx"> SegmentedVector<ArgumentPosition, 8> m_argumentPositions;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -55,6 +55,11 @@
</span><span class="cx"> class Graph;
</span><span class="cx"> struct BasicBlock;
</span><span class="cx">
</span><ins>+struct StorageAccessData {
+ PropertyOffset offset;
+ unsigned identifierNumber;
+};
+
</ins><span class="cx"> struct MultiGetByOffsetData {
</span><span class="cx"> unsigned identifierNumber;
</span><span class="cx"> Vector<GetByIdVariant, 2> variants;
</span><span class="lines">@@ -456,10 +461,10 @@
</span><span class="cx"> children.reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void convertToGetByOffset(unsigned storageAccessDataIndex, Edge storage)
</del><ins>+ void convertToGetByOffset(StorageAccessData& data, Edge storage)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_op == GetById || m_op == GetByIdFlush || m_op == MultiGetByOffset);
</span><del>- m_opInfo = storageAccessDataIndex;
</del><ins>+ m_opInfo = bitwise_cast<uintptr_t>(&data);
</ins><span class="cx"> children.setChild2(children.child1());
</span><span class="cx"> children.child2().setUseKind(KnownCellUse);
</span><span class="cx"> children.setChild1(storage);
</span><span class="lines">@@ -476,10 +481,10 @@
</span><span class="cx"> m_flags &= ~NodeClobbersWorld;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void convertToPutByOffset(unsigned storageAccessDataIndex, Edge storage)
</del><ins>+ void convertToPutByOffset(StorageAccessData& data, Edge storage)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_op == PutById || m_op == PutByIdDirect || m_op == PutByIdFlush || m_op == MultiPutByOffset);
</span><del>- m_opInfo = storageAccessDataIndex;
</del><ins>+ m_opInfo = bitwise_cast<uintptr_t>(&data);
</ins><span class="cx"> children.setChild3(children.child2());
</span><span class="cx"> children.setChild2(children.child1());
</span><span class="cx"> children.setChild1(storage);
</span><span class="lines">@@ -1153,10 +1158,10 @@
</span><span class="cx"> return op() == GetByOffset || op() == GetGetterSetterByOffset || op() == PutByOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned storageAccessDataIndex()
</del><ins>+ StorageAccessData& storageAccessData()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasStorageAccessData());
</span><del>- return m_opInfo;
</del><ins>+ return *bitwise_cast<StorageAccessData*>(m_opInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasMultiGetByOffsetData()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> StructureAbstractValue& value = state.forNode(node->child1()).m_structure;
</span><span class="cx"> if (value.isTop())
</span><span class="cx"> return false;
</span><del>- PropertyOffset offset = graph.m_storageAccessData[node->storageAccessDataIndex()].offset;
</del><ins>+ PropertyOffset offset = node->storageAccessData().offset;
</ins><span class="cx"> for (unsigned i = value.size(); i--;) {
</span><span class="cx"> if (!value[i]->isValidOffset(offset))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -3794,7 +3794,7 @@
</span><span class="cx"> GPRReg resultTagGPR = resultTag.gpr();
</span><span class="cx"> GPRReg resultPayloadGPR = resultPayload.gpr();
</span><span class="cx">
</span><del>- StorageAccessData& storageAccessData = m_jit.graph().m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& storageAccessData = node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> m_jit.load32(JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)), resultPayloadGPR);
</span><span class="cx"> m_jit.load32(JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag)), resultTagGPR);
</span><span class="lines">@@ -3810,7 +3810,7 @@
</span><span class="cx"> GPRReg storageGPR = storage.gpr();
</span><span class="cx"> GPRReg resultPayloadGPR = resultPayload.gpr();
</span><span class="cx">
</span><del>- StorageAccessData& storageAccessData = m_jit.graph().m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& storageAccessData = node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> m_jit.load32(JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)), resultPayloadGPR);
</span><span class="cx">
</span><span class="lines">@@ -3854,7 +3854,7 @@
</span><span class="cx">
</span><span class="cx"> speculate(node, node->child2());
</span><span class="cx">
</span><del>- StorageAccessData& storageAccessData = m_jit.graph().m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& storageAccessData = node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> m_jit.storePtr(valueTagGPR, JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag)));
</span><span class="cx"> m_jit.storePtr(valuePayloadGPR, JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -3889,7 +3889,7 @@
</span><span class="cx"> GPRReg storageGPR = storage.gpr();
</span><span class="cx"> GPRReg resultGPR = result.gpr();
</span><span class="cx">
</span><del>- StorageAccessData& storageAccessData = m_jit.graph().m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& storageAccessData = node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> m_jit.load64(JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset)), resultGPR);
</span><span class="cx">
</span><span class="lines">@@ -3934,7 +3934,7 @@
</span><span class="cx">
</span><span class="cx"> speculate(node, node->child2());
</span><span class="cx">
</span><del>- StorageAccessData& storageAccessData = m_jit.graph().m_storageAccessData[node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& storageAccessData = node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> m_jit.store64(valueGPR, JITCompiler::Address(storageGPR, offsetRelativeToBase(storageAccessData.offset)));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (173792 => 173793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-09-20 15:34:08 UTC (rev 173792)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-09-20 17:59:58 UTC (rev 173793)
</span><span class="lines">@@ -3251,8 +3251,7 @@
</span><span class="cx">
</span><span class="cx"> void compileGetByOffset()
</span><span class="cx"> {
</span><del>- StorageAccessData& data =
- m_graph.m_storageAccessData[m_node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& data = m_node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> setJSValue(loadProperty(
</span><span class="cx"> lowStorage(m_node->child1()), data.identifierNumber, data.offset));
</span><span class="lines">@@ -3337,8 +3336,7 @@
</span><span class="cx">
</span><span class="cx"> void compilePutByOffset()
</span><span class="cx"> {
</span><del>- StorageAccessData& data =
- m_graph.m_storageAccessData[m_node->storageAccessDataIndex()];
</del><ins>+ StorageAccessData& data = m_node->storageAccessData();
</ins><span class="cx">
</span><span class="cx"> storeProperty(
</span><span class="cx"> lowJSValue(m_node->child3()),
</span></span></pre>
</div>
</div>
</body>
</html>