<!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>[167467] 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/167467">167467</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-17 16:33:32 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>InlineCallFrameSet should be refcounted
https://bugs.webkit.org/show_bug.cgi?id=131829
Reviewed by Geoffrey Garen.
And DFG::Plan should hold a ref to it. Previously it was owned by Graph until it
became owned by JITCode. Except that if we're "failing" to compile, JITCode may die.
Even as it dies, the GC may still want to scan the DFG::Plan, which leads to scanning
the DesiredWriteBarriers, which leads to scanning the InlineCallFrameSet.
So, just make the darn thing refcounted.
* bytecode/InlineCallFrameSet.h:
* dfg/DFGArgumentsSimplificationPhase.cpp:
(JSC::DFG::ArgumentsSimplificationPhase::run):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::InlineStackEntry::InlineStackEntry):
* dfg/DFGCommonData.h:
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::Graph):
(JSC::DFG::Graph::requiredRegisterCountForExit):
* dfg/DFGGraph.h:
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::link):
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::Plan):
* dfg/DFGPlan.h:
* dfg/DFGStackLayoutPhase.cpp:
(JSC::DFG::StackLayoutPhase::run):
* ftl/FTLFail.cpp:
(JSC::FTL::fail):
* ftl/FTLLink.cpp:
(JSC::FTL::link):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInlineCallFrameSeth">trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArgumentsSimplificationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGArgumentsSimplificationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonDatah">trunk/Source/JavaScriptCore/dfg/DFGCommonData.h</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="#trunkSourceJavaScriptCoredfgDFGJITCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlanh">trunk/Source/JavaScriptCore/dfg/DFGPlan.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStackLayoutPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLFailcpp">trunk/Source/JavaScriptCore/ftl/FTLFail.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLinkcpp">trunk/Source/JavaScriptCore/ftl/FTLLink.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2014-04-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ InlineCallFrameSet should be refcounted
+ https://bugs.webkit.org/show_bug.cgi?id=131829
+
+ Reviewed by Geoffrey Garen.
+
+ And DFG::Plan should hold a ref to it. Previously it was owned by Graph until it
+ became owned by JITCode. Except that if we're "failing" to compile, JITCode may die.
+ Even as it dies, the GC may still want to scan the DFG::Plan, which leads to scanning
+ the DesiredWriteBarriers, which leads to scanning the InlineCallFrameSet.
+
+ So, just make the darn thing refcounted.
+
+ * bytecode/InlineCallFrameSet.h:
+ * dfg/DFGArgumentsSimplificationPhase.cpp:
+ (JSC::DFG::ArgumentsSimplificationPhase::run):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::InlineStackEntry::InlineStackEntry):
+ * dfg/DFGCommonData.h:
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::Graph):
+ (JSC::DFG::Graph::requiredRegisterCountForExit):
+ * dfg/DFGGraph.h:
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::link):
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::Plan):
+ * dfg/DFGPlan.h:
+ * dfg/DFGStackLayoutPhase.cpp:
+ (JSC::DFG::StackLayoutPhase::run):
+ * ftl/FTLFail.cpp:
+ (JSC::FTL::fail):
+ * ftl/FTLLink.cpp:
+ (JSC::FTL::link):
+
+2014-04-17 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL::fail() should manage memory "correctly"
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131823
</span><span class="cx"> <rdar://problem/16384297>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInlineCallFrameSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -28,12 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #include "CodeOrigin.h"
</span><span class="cx"> #include <wtf/Bag.h>
</span><del>-#include <wtf/Noncopyable.h>
</del><ins>+#include <wtf/RefCounted.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class InlineCallFrameSet {
- WTF_MAKE_NONCOPYABLE(InlineCallFrameSet);
</del><ins>+class InlineCallFrameSet : public RefCounted<InlineCallFrameSet> {
</ins><span class="cx"> public:
</span><span class="cx"> InlineCallFrameSet();
</span><span class="cx"> ~InlineCallFrameSet();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArgumentsSimplificationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArgumentsSimplificationPhase.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArgumentsSimplificationPhase.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGArgumentsSimplificationPhase.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> bool changed = false;
</span><span class="cx">
</span><span class="cx"> // Record which arguments are known to escape no matter what.
</span><del>- for (InlineCallFrameSet::iterator iter = m_graph.m_inlineCallFrames->begin(); !!iter; ++iter)
</del><ins>+ for (InlineCallFrameSet::iterator iter = m_graph.m_plan.inlineCallFrames->begin(); !!iter; ++iter)
</ins><span class="cx"> pruneObviousArgumentCreations(*iter);
</span><span class="cx"> pruneObviousArgumentCreations(0); // the machine call frame.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -3400,7 +3400,7 @@
</span><span class="cx"> ASSERT(inlineCallFrameStart.isValid());
</span><span class="cx"> ASSERT(callsiteBlockHead);
</span><span class="cx">
</span><del>- m_inlineCallFrame = byteCodeParser->m_graph.m_inlineCallFrames->add();
</del><ins>+ m_inlineCallFrame = byteCodeParser->m_graph.m_plan.inlineCallFrames->add();
</ins><span class="cx"> initializeLazyWriteBarrierForInlineCallFrameExecutable(
</span><span class="cx"> byteCodeParser->m_graph.m_plan.writeBarriers,
</span><span class="cx"> m_inlineCallFrame->executable,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommonData.h (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> return std::max(frameRegisterCount, requiredRegisterCountForExit);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<InlineCallFrameSet> inlineCallFrames;
</del><ins>+ RefPtr<InlineCallFrameSet> inlineCallFrames;
</ins><span class="cx"> Vector<CodeOrigin, 0, UnsafeVectorOverflow> codeOrigins;
</span><span class="cx">
</span><span class="cx"> Vector<Identifier> dfgIdentifiers;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> , m_profiledBlock(m_codeBlock->alternative())
</span><span class="cx"> , m_allocator(longLivedState.m_allocator)
</span><span class="cx"> , m_mustHandleAbstractValues(OperandsLike, plan.mustHandleValues)
</span><del>- , m_inlineCallFrames(adoptPtr(new InlineCallFrameSet()))
</del><span class="cx"> , m_hasArguments(false)
</span><span class="cx"> , m_nextMachineLocal(0)
</span><span class="cx"> , m_machineCaptureStart(std::numeric_limits<int>::max())
</span><span class="lines">@@ -761,7 +760,7 @@
</span><span class="cx"> unsigned Graph::requiredRegisterCountForExit()
</span><span class="cx"> {
</span><span class="cx"> unsigned count = JIT::frameRegisterCountFor(m_profiledBlock);
</span><del>- for (InlineCallFrameSet::iterator iter = m_inlineCallFrames->begin(); !!iter; ++iter) {
</del><ins>+ for (InlineCallFrameSet::iterator iter = m_plan.inlineCallFrames->begin(); !!iter; ++iter) {
</ins><span class="cx"> InlineCallFrame* inlineCallFrame = *iter;
</span><span class="cx"> CodeBlock* codeBlock = baselineCodeBlockForInlineCallFrame(inlineCallFrame);
</span><span class="cx"> unsigned requiredCount = VirtualRegister(inlineCallFrame->stackOffset).toLocal() + 1 + JIT::frameRegisterCountFor(codeBlock);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "DFGNodeAllocator.h"
</span><span class="cx"> #include "DFGPlan.h"
</span><span class="cx"> #include "DFGScannable.h"
</span><del>-#include "InlineCallFrameSet.h"
</del><span class="cx"> #include "JSStack.h"
</span><span class="cx"> #include "MethodOfGettingAValueProfile.h"
</span><span class="cx"> #include <wtf/BitVector.h>
</span><span class="lines">@@ -831,7 +830,6 @@
</span><span class="cx"> Bag<MultiGetByOffsetData> m_multiGetByOffsetData;
</span><span class="cx"> Bag<MultiPutByOffsetData> m_multiPutByOffsetData;
</span><span class="cx"> Vector<InlineVariableData, 4> m_inlineVariableData;
</span><del>- OwnPtr<InlineCallFrameSet> m_inlineCallFrames;
</del><span class="cx"> HashMap<CodeBlock*, std::unique_ptr<FullBytecodeLiveness>> m_bytecodeLiveness;
</span><span class="cx"> bool m_hasArguments;
</span><span class="cx"> HashSet<ExecutableBase*> m_executablesWhoseArgumentsEscaped;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -153,8 +153,8 @@
</span><span class="cx"> m_jitCode->common.frameRegisterCount = m_graph.frameRegisterCount();
</span><span class="cx"> m_jitCode->common.requiredRegisterCountForExit = m_graph.requiredRegisterCountForExit();
</span><span class="cx">
</span><del>- if (!m_graph.m_inlineCallFrames->isEmpty())
- m_jitCode->common.inlineCallFrames = m_graph.m_inlineCallFrames.release();
</del><ins>+ if (!m_graph.m_plan.inlineCallFrames->isEmpty())
+ m_jitCode->common.inlineCallFrames = m_graph.m_plan.inlineCallFrames;
</ins><span class="cx">
</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></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> , osrEntryBytecodeIndex(osrEntryBytecodeIndex)
</span><span class="cx"> , mustHandleValues(mustHandleValues)
</span><span class="cx"> , compilation(codeBlock->vm()->m_perBytecodeProfiler ? adoptRef(new Profiler::Compilation(codeBlock->vm()->m_perBytecodeProfiler->ensureBytecodesFor(codeBlock.get()), profilerCompilationKindForMode(mode))) : 0)
</span><ins>+ , inlineCallFrames(adoptRef(new InlineCallFrameSet()))
</ins><span class="cx"> , identifiers(codeBlock.get())
</span><span class="cx"> , weakReferences(codeBlock.get())
</span><span class="cx"> , willTryToTierUp(false)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.h (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.h 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.h 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx">
</span><span class="cx"> OwnPtr<Finalizer> finalizer;
</span><span class="cx">
</span><ins>+ RefPtr<InlineCallFrameSet> inlineCallFrames;
</ins><span class="cx"> DesiredWatchpoints watchpoints;
</span><span class="cx"> DesiredIdentifiers identifiers;
</span><span class="cx"> DesiredStructureChains chains;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStackLayoutPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (codeBlock()->uncheckedActivationRegister().isValid())
</span><span class="cx"> usedLocals.set(codeBlock()->activationRegister().toLocal());
</span><del>- for (InlineCallFrameSet::iterator iter = m_graph.m_inlineCallFrames->begin(); !!iter; ++iter) {
</del><ins>+ for (InlineCallFrameSet::iterator iter = m_graph.m_plan.inlineCallFrames->begin(); !!iter; ++iter) {
</ins><span class="cx"> InlineCallFrame* inlineCallFrame = *iter;
</span><span class="cx"> if (!inlineCallFrame->executable->usesArguments())
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLFailcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLFail.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLFail.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/ftl/FTLFail.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -40,9 +40,6 @@
</span><span class="cx"> {
</span><span class="cx"> state.graph.m_plan.finalizer = adoptPtr(new FailedFinalizer(state.graph.m_plan));
</span><span class="cx">
</span><del>- if (!state.graph.m_inlineCallFrames->isEmpty())
- state.jitCode->common.inlineCallFrames = std::move(state.graph.m_inlineCallFrames);
-
</del><span class="cx"> if (state.module)
</span><span class="cx"> llvm->DisposeModule(state.module);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLinkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLink.cpp (167466 => 167467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLink.cpp 2014-04-17 23:32:09 UTC (rev 167466)
+++ trunk/Source/JavaScriptCore/ftl/FTLLink.cpp 2014-04-17 23:33:32 UTC (rev 167467)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx">
</span><span class="cx"> state.jitCode->common.requiredRegisterCountForExit = graph.requiredRegisterCountForExit();
</span><span class="cx">
</span><del>- if (!graph.m_inlineCallFrames->isEmpty())
- state.jitCode->common.inlineCallFrames = std::move(graph.m_inlineCallFrames);
</del><ins>+ if (!graph.m_plan.inlineCallFrames->isEmpty())
+ state.jitCode->common.inlineCallFrames = graph.m_plan.inlineCallFrames;
</ins><span class="cx">
</span><span class="cx"> // Create the entrypoint. Note that we use this entrypoint totally differently
</span><span class="cx"> // depending on whether we're doing OSR entry or not.
</span></span></pre>
</div>
</div>
</body>
</html>