Unreviewed debug build fix after r187020.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Jul 2015 12:04:20 +0000 (12:04 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Jul 2015 12:04:20 +0000 (12:04 +0000)
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::addCurrentThread):
VM::exclusiveThread() has changed return type to ThreadIdentifier.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/heap/MachineStackMarker.cpp

index 32f67d6..bf55b71 100644 (file)
@@ -1,5 +1,13 @@
 2015-07-20  Per Arne Vollan  <peavo@outlook.com>
 
+        Unreviewed debug build fix after r187020.
+
+        * heap/MachineStackMarker.cpp:
+        (JSC::MachineThreads::addCurrentThread):
+        VM::exclusiveThread() has changed return type to ThreadIdentifier.
+
+2015-07-20  Per Arne Vollan  <peavo@outlook.com>
+
         JavaScriptCore performance is very bad on Windows
         https://bugs.webkit.org/show_bug.cgi?id=146448
 
index 4ae16a9..c1c3eae 100644 (file)
@@ -284,7 +284,7 @@ inline bool MachineThreads::Thread::operator==(const PlatformThread& other) cons
 
 void MachineThreads::addCurrentThread()
 {
-    ASSERT(!m_heap->vm()->hasExclusiveThread() || m_heap->vm()->exclusiveThread() == std::this_thread::get_id());
+    ASSERT(!m_heap->vm()->hasExclusiveThread() || m_heap->vm()->exclusiveThread() == currentThread());
 
     if (threadSpecificGet(m_threadSpecific)) {
         ASSERT(threadSpecificGet(m_threadSpecific) == this);