<!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>[160589] branches/jsCStack/Source</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/160589">160589</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 23:17:59 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>cStack: Crypto crashes in GC
https://bugs.webkit.org/show_bug.cgi?id=125730
Reviewed by Filip Pizlo.
Need to disable visiting the JSStack when we are on the C stack.
Made visiting the JSStack conditional on USE(SEPARATE_C_AND_JS_STACK)
and then turned off WTF_USE_SEPARATE_C_AND_JS_STACK in platform.h.
Source/JavaScriptCore:
* heap/Heap.cpp:
(JSC::Heap::markRoots):
* interpreter/JSStack.cpp:
(JSC::JSStack::gatherConservativeRoots):
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreheapHeapcpp">branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#branchesjsCStackSourceWTFChangeLog">branches/jsCStack/Source/WTF/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceWTFwtfPlatformh">branches/jsCStack/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160588 => 160589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-14 06:50:33 UTC (rev 160588)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-14 07:17:59 UTC (rev 160589)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-12-13 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ cStack: Crypto crashes in GC
+ https://bugs.webkit.org/show_bug.cgi?id=125730
+
+ Reviewed by Filip Pizlo.
+
+ Need to disable visiting the JSStack when we are on the C stack.
+ Made visiting the JSStack conditional on USE(SEPARATE_C_AND_JS_STACK)
+ and then turned off WTF_USE_SEPARATE_C_AND_JS_STACK in platform.h.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::markRoots):
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::gatherConservativeRoots):
+
+2013-12-13 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> cStack: Crypto doesn't work at all unless LLInt is disabled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125729
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp (160588 => 160589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp 2013-12-14 06:50:33 UTC (rev 160588)
+++ branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp 2013-12-14 07:17:59 UTC (rev 160589)
</span><span class="lines">@@ -458,6 +458,7 @@
</span><span class="cx"> m_machineThreads.gatherConservativeRoots(machineThreadRoots, &dummy);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(SEPARATE_C_AND_JS_STACK)
</ins><span class="cx"> ConservativeRoots stackRoots(&m_objectSpace.blocks(), &m_storageSpace);
</span><span class="cx"> m_codeBlocks.clearMarks();
</span><span class="cx"> {
</span><span class="lines">@@ -465,6 +466,7 @@
</span><span class="cx"> stack().gatherConservativeRoots(stackRoots, m_jitStubRoutines, m_codeBlocks);
</span><span class="cx"> stack().sanitizeStack();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> ConservativeRoots scratchBufferRoots(&m_objectSpace.blocks(), &m_storageSpace);
</span><span class="lines">@@ -496,12 +498,14 @@
</span><span class="cx"> visitor.append(machineThreadRoots);
</span><span class="cx"> visitor.donateAndDrain();
</span><span class="cx"> }
</span><ins>+#if USE(SEPARATE_C_AND_JS_STACK)
</ins><span class="cx"> {
</span><span class="cx"> GCPHASE(VisitStackRoots);
</span><span class="cx"> MARK_LOG_ROOT(visitor, "Stack");
</span><span class="cx"> visitor.append(stackRoots);
</span><span class="cx"> visitor.donateAndDrain();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(VisitScratchBufferRoots);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp (160588 => 160589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-14 06:50:33 UTC (rev 160588)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-14 07:17:59 UTC (rev 160589)
</span><span class="lines">@@ -95,12 +95,22 @@
</span><span class="cx">
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
</span><span class="cx"> {
</span><ins>+#if USE(SEPARATE_C_AND_JS_STACK)
</ins><span class="cx"> conservativeRoots.add(getBaseOfStack(), getTopOfStack());
</span><ins>+#else
+ UNUSED_PARAM(conservativeRoots);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
</span><span class="cx"> {
</span><ins>+#if USE(SEPARATE_C_AND_JS_STACK)
</ins><span class="cx"> conservativeRoots.add(getBaseOfStack(), getTopOfStack(), jitStubRoutines, codeBlocks);
</span><ins>+#else
+ UNUSED_PARAM(conservativeRoots);
+ UNUSED_PARAM(jitStubRoutines);
+ UNUSED_PARAM(codeBlocks);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSStack::sanitizeStack()
</span></span></pre></div>
<a id="branchesjsCStackSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/WTF/ChangeLog (160588 => 160589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/WTF/ChangeLog 2013-12-14 06:50:33 UTC (rev 160588)
+++ branches/jsCStack/Source/WTF/ChangeLog 2013-12-14 07:17:59 UTC (rev 160589)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-13 Michael Saboff <msaboff@apple.com>
+
+ cStack: Crypto crashes in GC
+ https://bugs.webkit.org/show_bug.cgi?id=125730
+
+ Reviewed by Filip Pizlo.
+
+ Need to disable visiting the JSStack when we are on the C stack.
+ Made visiting the JSStack conditional on USE(SEPARATE_C_AND_JS_STACK)
+ and then turned off WTF_USE_SEPARATE_C_AND_JS_STACK in platform.h.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2013-12-06 Laszlo Vidacs <lac@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Define SHA1 hash size in SHA1.h and use it at various places.
</span></span></pre></div>
<a id="branchesjsCStackSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/WTF/wtf/Platform.h (160588 => 160589)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/WTF/wtf/Platform.h 2013-12-14 06:50:33 UTC (rev 160588)
+++ branches/jsCStack/Source/WTF/wtf/Platform.h 2013-12-14 07:17:59 UTC (rev 160589)
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> C stack for JS frames, we'll need to make the following conditional on ENABLE(LLINT_CLOOP)
</span><span class="cx"> only.
</span><span class="cx"> */
</span><del>-#if ENABLE(LLINT_CLOOP) || 1
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> #define WTF_USE_SEPARATE_C_AND_JS_STACK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>