<!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>[163664] 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/163664">163664</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 16:46:28 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert workaround committed in http://trac.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/163595">r163595</a>.
<https://webkit.org/b/128408>
Reviewed by Geoffrey Garen.
Now that we have fixed the bugs in JSLock's stack limit adjusments
in https://bugs.webkit.org/show_bug.cgi?id=128406, we can revert the
workaround in <a href="http://trac.webkit.org/projects/webkit/changeset/163595">r163595</a>.
* API/JSContextRef.cpp:
(JSContextGroupCreate):
(JSGlobalContextCreateInGroup):
* API/tests/testapi.js:
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::updateStackLimitWithReservedZoneSize):
* runtime/VM.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContextRefcpp">trunk/Source/JavaScriptCore/API/JSContextRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapijs">trunk/Source/JavaScriptCore/API/tests/testapi.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSContextRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContextRef.cpp (163663 => 163664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContextRef.cpp 2014-02-08 00:37:32 UTC (rev 163663)
+++ trunk/Source/JavaScriptCore/API/JSContextRef.cpp 2014-02-08 00:46:28 UTC (rev 163664)
</span><span class="lines">@@ -57,9 +57,7 @@
</span><span class="cx"> JSContextGroupRef JSContextGroupCreate()
</span><span class="cx"> {
</span><span class="cx"> initializeThreading();
</span><del>- VM* vm = VM::createContextGroup().leakRef();
- vm->ignoreStackLimit();
- return toRef(vm);
</del><ins>+ return toRef(VM::createContextGroup().leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)
</span><span class="lines">@@ -131,13 +129,7 @@
</span><span class="cx"> {
</span><span class="cx"> initializeThreading();
</span><span class="cx">
</span><del>- RefPtr<VM> vm;
- if (group)
- vm = PassRefPtr<VM>(toJS(group));
- else {
- vm = VM::createContextGroup();
- vm->ignoreStackLimit();
- }
</del><ins>+ RefPtr<VM> vm = group ? PassRefPtr<VM>(toJS(group)) : VM::createContextGroup();
</ins><span class="cx">
</span><span class="cx"> APIEntryShim entryShim(vm.get(), false);
</span><span class="cx"> vm->makeUsableFromMultipleThreads();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapijs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.js (163663 => 163664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.js 2014-02-08 00:37:32 UTC (rev 163663)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.js 2014-02-08 00:46:28 UTC (rev 163664)
</span><span class="lines">@@ -242,7 +242,6 @@
</span><span class="cx"> shouldBe('derivedOnlyDescriptor.enumerable', false);
</span><span class="cx">
</span><span class="cx"> shouldBe("undefined instanceof MyObject", false);
</span><del>-/*
</del><span class="cx"> EvilExceptionObject.hasInstance = function f() { return f(); };
</span><span class="cx"> EvilExceptionObject.__proto__ = undefined;
</span><span class="cx"> shouldThrow("undefined instanceof EvilExceptionObject");
</span><span class="lines">@@ -253,7 +252,6 @@
</span><span class="cx"> shouldThrow("EvilExceptionObject*5");
</span><span class="cx"> EvilExceptionObject.toStringExplicit = function f() { return f(); }
</span><span class="cx"> shouldThrow("String(EvilExceptionObject)");
</span><del>- */
</del><span class="cx">
</span><span class="cx"> shouldBe("EmptyObject", "[object CallbackObject]");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163663 => 163664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-08 00:37:32 UTC (rev 163663)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-08 00:46:28 UTC (rev 163664)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-02-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Revert workaround committed in http://trac.webkit.org/r163595.
+ <https://webkit.org/b/128408>
+
+ Reviewed by Geoffrey Garen.
+
+ Now that we have fixed the bugs in JSLock's stack limit adjusments
+ in https://bugs.webkit.org/show_bug.cgi?id=128406, we can revert the
+ workaround in r163595.
+
+ * API/JSContextRef.cpp:
+ (JSContextGroupCreate):
+ (JSGlobalContextCreateInGroup):
+ * API/tests/testapi.js:
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::VM::updateStackLimitWithReservedZoneSize):
+ * runtime/VM.h:
+
+2014-02-07 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Fix bug in stack limit adjustments in JSLock.
</span><span class="cx"> <https://webkit.org/b/128406>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (163663 => 163664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-02-08 00:37:32 UTC (rev 163663)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-02-08 00:46:28 UTC (rev 163664)
</span><span class="lines">@@ -219,7 +219,6 @@
</span><span class="cx"> #if ENABLE(GC_VALIDATION)
</span><span class="cx"> , m_initializingObjectClass(0)
</span><span class="cx"> #endif
</span><del>- , m_ignoreStackLimit(false)
</del><span class="cx"> , m_stackLimit(0)
</span><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> , m_jsStackLimit(0)
</span><span class="lines">@@ -739,11 +738,6 @@
</span><span class="cx">
</span><span class="cx"> size_t VM::updateStackLimitWithReservedZoneSize(size_t reservedZoneSize)
</span><span class="cx"> {
</span><del>- if (m_ignoreStackLimit) {
- setStackLimit(0);
- return 0;
- }
-
</del><span class="cx"> size_t oldReservedZoneSize = m_reservedZoneSize;
</span><span class="cx"> m_reservedZoneSize = reservedZoneSize;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (163663 => 163664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2014-02-08 00:37:32 UTC (rev 163663)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2014-02-08 00:46:28 UTC (rev 163664)
</span><span class="lines">@@ -387,8 +387,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> void* stackLimit() { return m_stackLimit; }
</span><span class="cx">
</span><del>- void ignoreStackLimit() { m_ignoreStackLimit = true; }
-
</del><span class="cx"> bool isSafeToRecurse(size_t neededStackInBytes = 0) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><span class="lines">@@ -523,7 +521,6 @@
</span><span class="cx"> #if ENABLE(GC_VALIDATION)
</span><span class="cx"> const ClassInfo* m_initializingObjectClass;
</span><span class="cx"> #endif
</span><del>- bool m_ignoreStackLimit;
</del><span class="cx"> size_t m_reservedZoneSize;
</span><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> struct {
</span></span></pre>
</div>
</div>
</body>
</html>