Title: [171484] tags/Safari-600.1.2/Source/_javascript_Core
- Revision
- 171484
- Author
- [email protected]
- Date
- 2014-07-23 12:49:15 -0700 (Wed, 23 Jul 2014)
Log Message
Merged r171474. <rdar://problem/17041912>
Modified Paths
Diff
Modified: tags/Safari-600.1.2/Source/_javascript_Core/ChangeLog (171483 => 171484)
--- tags/Safari-600.1.2/Source/_javascript_Core/ChangeLog 2014-07-23 18:39:41 UTC (rev 171483)
+++ tags/Safari-600.1.2/Source/_javascript_Core/ChangeLog 2014-07-23 19:49:15 UTC (rev 171484)
@@ -1,5 +1,9 @@
2014-07-23 Lucas Forschler <[email protected]>
+ Merge r171474 (rollout r171367 from trunk)
+
+2014-07-23 Lucas Forschler <[email protected]>
+
Merge r171367
2014-07-22 Joseph Pecoraro <[email protected]>
Modified: tags/Safari-600.1.2/Source/_javascript_Core/runtime/JSLock.cpp (171483 => 171484)
--- tags/Safari-600.1.2/Source/_javascript_Core/runtime/JSLock.cpp 2014-07-23 18:39:41 UTC (rev 171483)
+++ tags/Safari-600.1.2/Source/_javascript_Core/runtime/JSLock.cpp 2014-07-23 19:49:15 UTC (rev 171484)
@@ -93,7 +93,7 @@
void JSLock::willDestroyVM(VM* vm)
{
ASSERT_UNUSED(vm, m_vm == vm);
- m_vm = nullptr;
+ m_vm = 0;
}
void JSLock::setExclusiveThread(std::thread::id threadId)
@@ -167,11 +167,9 @@
void JSLock::willReleaseLock()
{
- if (!m_vm)
- return;
+ if (m_vm)
+ m_vm->setStackPointerAtVMEntry(nullptr);
- m_vm->setStackPointerAtVMEntry(nullptr);
-
wtfThreadData().setCurrentAtomicStringTable(m_entryAtomicStringTable);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
