Title: [171465] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 171465
- Author
- [email protected]
- Date
- 2014-07-23 01:32:50 -0700 (Wed, 23 Jul 2014)
Log Message
Merged r171367. <rdar://problem/17041912>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (171464 => 171465)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-23 08:29:32 UTC (rev 171464)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-23 08:32:50 UTC (rev 171465)
@@ -1,5 +1,21 @@
2014-07-23 Lucas Forschler <[email protected]>
+ Merge r171367
+
+ 2014-07-22 Joseph Pecoraro <[email protected]>
+
+ 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-23 Lucas Forschler <[email protected]>
+
Merge r171355
2014-07-21 Sam Weinig <[email protected]>
Modified: branches/safari-600.1-branch/Source/_javascript_Core/runtime/JSLock.cpp (171464 => 171465)
--- branches/safari-600.1-branch/Source/_javascript_Core/runtime/JSLock.cpp 2014-07-23 08:29:32 UTC (rev 171464)
+++ branches/safari-600.1-branch/Source/_javascript_Core/runtime/JSLock.cpp 2014-07-23 08:32:50 UTC (rev 171465)
@@ -93,7 +93,7 @@
void JSLock::willDestroyVM(VM* vm)
{
ASSERT_UNUSED(vm, m_vm == vm);
- m_vm = 0;
+ m_vm = nullptr;
}
void JSLock::setExclusiveThread(std::thread::id threadId)
@@ -167,9 +167,11 @@
void JSLock::willReleaseLock()
{
- if (m_vm)
- m_vm->setStackPointerAtVMEntry(nullptr);
+ if (!m_vm)
+ return;
+ m_vm->setStackPointerAtVMEntry(nullptr);
+
wtfThreadData().setCurrentAtomicStringTable(m_entryAtomicStringTable);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
