Changeset 171367 in webkit

Timestamp:

Jul 22, 2014 3:09:34 PM (10 years ago)

Author:

Joseph Pecoraro

Message:

JSLock release should only modify the AtomicStringTable if it modified in acquire
​https://bugs.webkit.org/show_bug.cgi?id=135143

Reviewed by Pratik Solanki.

• runtime/JSLock.cpp:

(JSC::JSLock::willDestroyVM):
(JSC::JSLock::willReleaseLock):
Only set the AtomicStringTable when there was a VM, to balance JSLock::didAcquireLock.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSLock.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-07-22  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 Pratik Solanki.
+
+        * runtime/JSLock.cpp:
+        (JSC::JSLock::willDestroyVM):
+        (JSC::JSLock::willReleaseLock):
+        Only set the AtomicStringTable when there was a VM, to balance JSLock::didAcquireLock.
+
 2014-07-22  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -94 +94 @@
 {
     ASSERT_UNUSED(vm, m_vm == vm);
-    m_vm = 0;
+    m_vm = nullptr;
 }
 
@@ -168 +168 @@
 void JSLock::willReleaseLock()
 {
-    if (m_vm)
-        m_vm->setStackPointerAtVMEntry(nullptr);
+    if (!m_vm)
+        return;
+
+    m_vm->setStackPointerAtVMEntry(nullptr);
 
     wtfThreadData().setCurrentAtomicStringTable(m_entryAtomicStringTable);