<!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>[171558] 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/171558">171558</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-24 16:56:34 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSLock release should only modify the AtomicStringTable if it modified in acquire
https://bugs.webkit.org/show_bug.cgi?id=135143
Reviewed by Darin Adler.
* runtime/JSLock.cpp:
(JSC::JSLock::JSLock):
Initialize the member variable to nullptr.
(JSC::JSLock::willDestroyVM):
Update style to use nullptr instead of 0.
(JSC::JSLock::willReleaseLock):
We should only reset the thread data's atomic string table if
didAcquireLock changed it. m_entryAtomicStringTable will have
been set by didAcquireLock if it changed, or nullptr if it didn't.
This way we are sure we are balanced, regardless of m_vm changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (171557 => 171558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-24 23:50:19 UTC (rev 171557)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-24 23:56:34 UTC (rev 171558)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-24 Joseph Pecoraro <pecoraro@apple.com>
+
+ JSLock release should only modify the AtomicStringTable if it modified in acquire
+ https://bugs.webkit.org/show_bug.cgi?id=135143
+
+ Reviewed by Darin Adler.
+
+ * runtime/JSLock.cpp:
+ (JSC::JSLock::JSLock):
+ Initialize the member variable to nullptr.
+
+ (JSC::JSLock::willDestroyVM):
+ Update style to use nullptr instead of 0.
+
+ (JSC::JSLock::willReleaseLock):
+ We should only reset the thread data's atomic string table if
+ didAcquireLock changed it. m_entryAtomicStringTable will have
+ been set by didAcquireLock if it changed, or nullptr if it didn't.
+ This way we are sure we are balanced, regardless of m_vm changes.
+
</ins><span class="cx"> 2014-07-24 Peyton Randolph <prandolph@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename feature flag for long-press gesture on Mac.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (171557 => 171558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-07-24 23:50:19 UTC (rev 171557)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-07-24 23:56:34 UTC (rev 171558)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> , m_lockDropDepth(0)
</span><span class="cx"> , m_hasExclusiveThread(false)
</span><span class="cx"> , m_vm(vm)
</span><ins>+ , m_entryAtomicStringTable(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx"> void JSLock::willDestroyVM(VM* vm)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(vm, m_vm == vm);
</span><del>- m_vm = 0;
</del><ins>+ m_vm = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSLock::setExclusiveThread(std::thread::id threadId)
</span><span class="lines">@@ -139,7 +140,10 @@
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="cx"> m_vm->setLastStackTop(threadData.savedLastStackTop());
</span><span class="cx">
</span><ins>+ ASSERT(!m_entryAtomicStringTable);
</ins><span class="cx"> m_entryAtomicStringTable = threadData.setCurrentAtomicStringTable(m_vm->atomicStringTable());
</span><ins>+ ASSERT(m_entryAtomicStringTable);
+
</ins><span class="cx"> m_vm->heap.machineThreads().addCurrentThread();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -170,7 +174,10 @@
</span><span class="cx"> if (m_vm)
</span><span class="cx"> m_vm->setStackPointerAtVMEntry(nullptr);
</span><span class="cx">
</span><del>- wtfThreadData().setCurrentAtomicStringTable(m_entryAtomicStringTable);
</del><ins>+ if (m_entryAtomicStringTable) {
+ wtfThreadData().setCurrentAtomicStringTable(m_entryAtomicStringTable);
+ m_entryAtomicStringTable = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSLock::lock(ExecState* exec)
</span></span></pre>
</div>
</div>
</body>
</html>