Changeset 34990 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 3, 2008, 4:22:06 PM (17 years ago)

Author:

[email protected]

Message:

Fix the 64-bit build.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSLock.cpp (modified) (7 diffs)
• kjs/JSLock.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-07-02  Mark Rowe  <[email protected]>
+
+        Fix the 64-bit build.  pthread_getspecific works with pointer-sized values,
+        so use ssize_t rather than int to track the lock count to avoid warnings about
+        truncating the result of pthread_getspecific.
+
+        * kjs/JSLock.cpp:
+        (KJS::JSLock::lockCount):
+        (KJS::JSLock::lock):
+        (KJS::JSLock::unlock):
+        (KJS::JSLock::DropAllLocks::DropAllLocks):
+        * kjs/JSLock.h:
+
 2008-07-03  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSLock.cpp

@@ -49 +49 @@
 
 // Lock nesting count.
-int JSLock::lockCount()
-{
-    pthread_once(&createJSLockCountOnce, createJSLockCount);
-
-    return reinterpret_cast<int>(pthread_getspecific(JSLockCount));
-}
-
-static void setLockCount(int count)
-{
+ssize_t JSLock::lockCount()
+{
+    pthread_once(&createJSLockCountOnce, createJSLockCount);
+
+    return reinterpret_cast<ssize_t>(pthread_getspecific(JSLockCount));
+}
+
+static void setLockCount(ssize_t count)
+{
+    ASSERT(count >= 0);
     pthread_setspecific(JSLockCount, reinterpret_cast<void*>(count));
 }
@@ -79 +80 @@
     pthread_once(&createJSLockCountOnce, createJSLockCount);
 
-    int currentLockCount = lockCount();
+    ssize_t currentLockCount = lockCount();
     if (!currentLockCount && lockForReal) {
         int result;
@@ -98 +99 @@
 #endif
 
-    int newLockCount = lockCount() - 1;
+    ssize_t newLockCount = lockCount() - 1;
     setLockCount(newLockCount);
     if (!newLockCount && lockForReal) {
@@ -134 +135 @@
 
     m_lockCount = JSLock::lockCount();
-    for (int i = 0; i < m_lockCount; i++)
+    for (ssize_t i = 0; i < m_lockCount; i++)
         JSLock::unlock(m_lockingForReal);
 }
@@ -147 +148 @@
 
     m_lockCount = JSLock::lockCount();
-    for (int i = 0; i < m_lockCount; i++)
+    for (ssize_t i = 0; i < m_lockCount; i++)
         JSLock::unlock(m_lockingForReal);
 }
@@ -153 +154 @@
 JSLock::DropAllLocks::~DropAllLocks()
 {
-    for (int i = 0; i < m_lockCount; i++)
+    for (ssize_t i = 0; i < m_lockCount; i++)
         JSLock::lock(m_lockingForReal);
 }
@@ -166 +167 @@
 // If threading support is off, set the lock count to a constant value of 1 so assertions
 // that the lock is held don't fail
-int JSLock::lockCount()
+ssize_t JSLock::lockCount()
 {
     return 1;

trunk/JavaScriptCore/kjs/JSLock.h

@@ -85 +85 @@
         static void unlock(ExecState*);
 
-        static int lockCount();
+        static ssize_t lockCount();
         static bool currentThreadIsHoldingLock();
 
@@ -99 +99 @@
             
         private:
-            int m_lockCount;
+            ssize_t m_lockCount;
             bool m_lockingForReal;
         };