Changeset 163672 in webkit

Timestamp:

Feb 7, 2014 6:01:22 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

iOS port needs to clear VM::stackPointerAtVMEntry when it drops locks.
<​https://webkit.org/b/128424>

Reviewed by Geoffrey Garen.

The iOS code path for dropping locks differ from the non-iOS code path
in that it (iOS) does not clear m_vm->stackPointerAtVMEntry nor reset the
VM stack limit. This is now fixed by copying that snippit from
JSLock::unlock().

• runtime/JSLock.cpp:

(JSC::JSLock::dropAllLocks):
(JSC::JSLock::dropAllLocksUnconditionally):

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-02-07  Mark Lam  <mark.lam@apple.com>
+
+        iOS port needs to clear VM::stackPointerAtVMEntry when it drops locks.
+        <https://webkit.org/b/128424>
+
+        Reviewed by Geoffrey Garen.
+
+        The iOS code path for dropping locks differ from the non-iOS code path
+        in that it (iOS) does not clear m_vm->stackPointerAtVMEntry nor reset the
+        VM stack limit. This is now fixed by copying that snippit from
+        JSLock::unlock().
+
+        * runtime/JSLock.cpp:
+        (JSC::JSLock::dropAllLocks):
+        (JSC::JSLock::dropAllLocksUnconditionally):
+
 2014-02-07  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -226 +226 @@
     ++m_lockDropDepth;
     m_lockCount = 0;
+    if (m_vm) {
+        m_vm->stackPointerAtVMEntry = nullptr;
+        m_vm->updateStackLimitWithReservedZoneSize(wtfThreadData().savedReservedZoneSize());
+    }
     m_lock.unlock();
     return lockCount;
@@ -249 +253 @@
     ++m_lockDropDepth;
     m_lockCount = 0;
+    if (m_vm) {
+        m_vm->stackPointerAtVMEntry = nullptr;
+        m_vm->updateStackLimitWithReservedZoneSize(wtfThreadData().savedReservedZoneSize());
+    }
     m_lock.unlock();
     return lockCount;