<!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>[204856] 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/204856">204856</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 13:29:35 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix CLoop build.
This fixes the CLoop build while still ensuring that Interpreter.h is a project header.
* llint/LowLevelInterpreter.cpp:
* runtime/VM.cpp:
(JSC::VM::ensureStackCapacityForCLoop):
(JSC::VM::isSafeToRecurseSoftCLoop):
* runtime/VM.h:
* runtime/VMInlines.h:
(JSC::VM::ensureStackCapacityFor):
(JSC::VM::isSafeToRecurseSoft):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpretercpp">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMInlinesh">trunk/Source/JavaScriptCore/runtime/VMInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204855 => 204856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-23 20:29:35 UTC (rev 204856)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-23 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, fix CLoop build.
+
+ This fixes the CLoop build while still ensuring that Interpreter.h is a project header.
+
+ * llint/LowLevelInterpreter.cpp:
+ * runtime/VM.cpp:
+ (JSC::VM::ensureStackCapacityForCLoop):
+ (JSC::VM::isSafeToRecurseSoftCLoop):
+ * runtime/VM.h:
+ * runtime/VMInlines.h:
+ (JSC::VM::ensureStackCapacityFor):
+ (JSC::VM::isSafeToRecurseSoft):
+
</ins><span class="cx"> 2016-08-22 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Butterflies should be allocated in Auxiliary MarkedSpace instead of CopiedSpace and we should rewrite as much of the GC as needed to make this not a regression
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (204855 => 204856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2016-08-23 20:29:35 UTC (rev 204856)
</span><span class="lines">@@ -25,13 +25,17 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "LowLevelInterpreter.h"
</span><ins>+
</ins><span class="cx"> #include "LLIntOfflineAsmConfig.h"
</span><span class="cx"> #include <wtf/InlineASM.h>
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(JIT)
</span><ins>+#include "CLoopStackInlines.h"
</ins><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "CommonSlowPaths.h"
</span><ins>+#include "Interpreter.h"
</ins><span class="cx"> #include "LLIntCLoop.h"
</span><ins>+#include "LLIntData.h"
</ins><span class="cx"> #include "LLIntSlowPaths.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (204855 => 204856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-08-23 20:29:35 UTC (rev 204856)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx"> #include "CLoopStack.h"
</span><ins>+#include "CLoopStackInlines.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="lines">@@ -876,4 +877,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ENABLE(JIT)
+bool VM::ensureStackCapacityForCLoop(Register* newTopOfStack)
+{
+ return interpreter->cloopStack().ensureCapacityFor(newTopOfStack);
+}
+
+bool VM::isSafeToRecurseSoftCLoop() const
+{
+ return interpreter->cloopStack().isSafeToRecurse();
+}
+#endif // !ENABLE(JIT)
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (204855 => 204856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-08-23 20:29:35 UTC (rev 204856)
</span><span class="lines">@@ -644,6 +644,11 @@
</span><span class="cx"> m_lastException = exception;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ENABLE(JIT)
+ bool ensureStackCapacityForCLoop(Register* newTopOfStack);
+ bool isSafeToRecurseSoftCLoop() const;
+#endif // !ENABLE(JIT)
+
</ins><span class="cx"> #if ENABLE(ASSEMBLER)
</span><span class="cx"> bool m_canUseAssembler;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMInlines.h (204855 => 204856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMInlines.h 2016-08-23 20:20:41 UTC (rev 204855)
+++ trunk/Source/JavaScriptCore/runtime/VMInlines.h 2016-08-23 20:29:35 UTC (rev 204856)
</span><span class="lines">@@ -30,10 +30,6 @@
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "Watchdog.h"
</span><span class="cx">
</span><del>-#if !ENABLE(JIT)
-#include "CLoopStackInlines.h"
-#endif
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> bool VM::ensureStackCapacityFor(Register* newTopOfStack)
</span><span class="lines">@@ -42,7 +38,7 @@
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><span class="cx"> return newTopOfStack >= m_softStackLimit;
</span><span class="cx"> #else
</span><del>- return interpreter->cloopStack().ensureCapacityFor(newTopOfStack);
</del><ins>+ return ensureStackCapacityForCLoop(newTopOfStack);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -51,7 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool safe = isSafeToRecurse(m_softStackLimit);
</span><span class="cx"> #if !ENABLE(JIT)
</span><del>- safe = safe && interpreter->cloopStack().isSafeToRecurse();
</del><ins>+ safe = safe && isSafeToRecurseSoftCLoop();
</ins><span class="cx"> #endif
</span><span class="cx"> return safe;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>