<!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>[189518] 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/189518">189518</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-09-08 17:20:12 -0700 (Tue, 08 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>InlineCallFrames shouldn't be strongly marked by CodeBlock
https://bugs.webkit.org/show_bug.cgi?id=146613
Reviewed by Saam Barati.
This code was vestigial an unnecessary, so I removed it.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::stronglyVisitStrongReferences):
* bytecode/InlineCallFrame.cpp:
(JSC::InlineCallFrame::calleeConstant):
(JSC::InlineCallFrame::calleeForCallFrame):
(JSC::InlineCallFrame::visitAggregate): Deleted.
* bytecode/InlineCallFrame.h:
(JSC::InlineCallFrame::specializationKind):
* bytecode/InlineCallFrameSet.cpp:
(JSC::InlineCallFrameSet::add):
(JSC::InlineCallFrameSet::visitAggregate): Deleted.
* bytecode/InlineCallFrameSet.h:
(JSC::InlineCallFrameSet::begin):
(JSC::InlineCallFrameSet::end):</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="#trunkSourceJavaScriptCorebytecodeInlineCallFramecpp">trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInlineCallFrameh">trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInlineCallFrameSetcpp">trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInlineCallFrameSeth">trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189517 => 189518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-09 00:19:15 UTC (rev 189517)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-09 00:20:12 UTC (rev 189518)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-08 Geoffrey Garen <ggaren@apple.com>
+
+ InlineCallFrames shouldn't be strongly marked by CodeBlock
+ https://bugs.webkit.org/show_bug.cgi?id=146613
+
+ Reviewed by Saam Barati.
+
+ This code was vestigial an unnecessary, so I removed it.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::stronglyVisitStrongReferences):
+ * bytecode/InlineCallFrame.cpp:
+ (JSC::InlineCallFrame::calleeConstant):
+ (JSC::InlineCallFrame::calleeForCallFrame):
+ (JSC::InlineCallFrame::visitAggregate): Deleted.
+ * bytecode/InlineCallFrame.h:
+ (JSC::InlineCallFrame::specializationKind):
+ * bytecode/InlineCallFrameSet.cpp:
+ (JSC::InlineCallFrameSet::add):
+ (JSC::InlineCallFrameSet::visitAggregate): Deleted.
+ * bytecode/InlineCallFrameSet.h:
+ (JSC::InlineCallFrameSet::begin):
+ (JSC::InlineCallFrameSet::end):
+
</ins><span class="cx"> 2015-09-08 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> GC stack scan should include ABI red zone.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (189517 => 189518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-09-09 00:19:15 UTC (rev 189517)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-09-09 00:20:12 UTC (rev 189518)
</span><span class="lines">@@ -2833,21 +2833,6 @@
</span><span class="cx"> for (unsigned i = 0; i < m_objectAllocationProfiles.size(); ++i)
</span><span class="cx"> m_objectAllocationProfiles[i].visitAggregate(visitor);
</span><span class="cx">
</span><del>-#if ENABLE(DFG_JIT)
- if (JITCode::isOptimizingJIT(jitType())) {
- // FIXME: This is an antipattern for two reasons. References introduced by the DFG
- // that aren't in the original CodeBlock being compiled should be weakly referenced.
- // Inline call frames aren't in the original CodeBlock, so they qualify as weak. Also,
- // those weak references should already be tracked in the DFG as weak FrozenValues. So,
- // there is probably no need for this. We already have assertions that this should be
- // unnecessary.
- // https://bugs.webkit.org/show_bug.cgi?id=146613
- DFG::CommonData* dfgCommon = m_jitCode->dfgCommon();
- if (dfgCommon->inlineCallFrames.get())
- dfgCommon->inlineCallFrames->visitAggregate(visitor);
- }
-#endif
-
</del><span class="cx"> updateAllPredictions();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInlineCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.cpp (189517 => 189518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.cpp 2015-09-09 00:19:15 UTC (rev 189517)
+++ trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.cpp 2015-09-09 00:20:12 UTC (rev 189518)
</span><span class="lines">@@ -40,20 +40,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InlineCallFrame::visitAggregate(SlotVisitor& visitor)
-{
- // FIXME: This is an antipattern for two reasons. References introduced by the DFG
- // that aren't in the original CodeBlock being compiled should be weakly referenced.
- // Inline call frames aren't in the original CodeBlock, so they qualify as weak. Also,
- // those weak references should already be tracked in the DFG as weak FrozenValues. So,
- // there is probably no need for this. We already have assertions that this should be
- // unnecessary. Finally, just marking the executable and not anything else in the inline
- // call frame is almost certainly insufficient for what this method thought it was going
- // to accomplish.
- // https://bugs.webkit.org/show_bug.cgi?id=146613
- visitor.append(&executable);
-}
-
</del><span class="cx"> JSFunction* InlineCallFrame::calleeForCallFrame(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> return jsCast<JSFunction*>(calleeRecovery.recover(exec));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInlineCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h (189517 => 189518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h 2015-09-09 00:19:15 UTC (rev 189517)
+++ trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h 2015-09-09 00:20:12 UTC (rev 189518)
</span><span class="lines">@@ -137,7 +137,6 @@
</span><span class="cx"> CodeSpecializationKind specializationKind() const { return specializationKindFor(static_cast<Kind>(kind)); }
</span><span class="cx">
</span><span class="cx"> JSFunction* calleeConstant() const;
</span><del>- void visitAggregate(SlotVisitor&);
</del><span class="cx">
</span><span class="cx"> // Get the callee given a machine call frame to which this InlineCallFrame belongs.
</span><span class="cx"> JSFunction* calleeForCallFrame(ExecState*) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInlineCallFrameSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.cpp (189517 => 189518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.cpp 2015-09-09 00:19:15 UTC (rev 189517)
+++ trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.cpp 2015-09-09 00:20:12 UTC (rev 189518)
</span><span class="lines">@@ -39,11 +39,5 @@
</span><span class="cx"> return m_frames.add();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InlineCallFrameSet::visitAggregate(SlotVisitor& visitor)
-{
- for (InlineCallFrame* callFrame : m_frames)
- callFrame->visitAggregate(visitor);
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInlineCallFrameSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h (189517 => 189518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h 2015-09-09 00:19:15 UTC (rev 189517)
+++ trunk/Source/JavaScriptCore/bytecode/InlineCallFrameSet.h 2015-09-09 00:20:12 UTC (rev 189518)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx"> iterator begin() { return m_frames.begin(); }
</span><span class="cx"> iterator end() { return m_frames.end(); }
</span><span class="cx">
</span><del>- void visitAggregate(SlotVisitor&);
-
</del><span class="cx"> private:
</span><span class="cx"> Bag<InlineCallFrame> m_frames;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>