Title: [171474] trunk/Source/_javascript_Core
- Revision
- 171474
- Author
- [email protected]
- Date
- 2014-07-23 03:31:37 -0700 (Wed, 23 Jul 2014)
Log Message
Unreviewed, rolling out r171367.
https://bugs.webkit.org/show_bug.cgi?id=135192
broke three API tests (Requested by thorton on #webkit).
Reverted changeset:
"JSLock release should only modify the AtomicStringTable if it
modified in acquire"
https://bugs.webkit.org/show_bug.cgi?id=135143
http://trac.webkit.org/changeset/171367
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (171473 => 171474)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-23 10:27:32 UTC (rev 171473)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-23 10:31:37 UTC (rev 171474)
@@ -1,3 +1,17 @@
+2014-07-23 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r171367.
+ https://bugs.webkit.org/show_bug.cgi?id=135192
+
+ broke three API tests (Requested by thorton on #webkit).
+
+ Reverted changeset:
+
+ "JSLock release should only modify the AtomicStringTable if it
+ modified in acquire"
+ https://bugs.webkit.org/show_bug.cgi?id=135143
+ http://trac.webkit.org/changeset/171367
+
2014-07-22 László Langó <[email protected]>
[EFL] Build fix after the [ftlopt] branch merge.
Modified: trunk/Source/_javascript_Core/runtime/JSLock.cpp (171473 => 171474)
--- trunk/Source/_javascript_Core/runtime/JSLock.cpp 2014-07-23 10:27:32 UTC (rev 171473)
+++ trunk/Source/_javascript_Core/runtime/JSLock.cpp 2014-07-23 10:31:37 UTC (rev 171474)
@@ -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
