Commits

Dan Villiom Podlaski Christiansen committed 9f54d36 Merge

trunk merge

Comments (0)

Files changed (1)

lib/JnJVM/VMCore/JavaObject.cpp

     }
   } else {
     uintptr_t currentLock = lock & ThinMask;
-    uintptr_t val = (uintptr_t)__sync_val_compare_and_swap(&lock, currentLock, (id + 1));
+    uintptr_t val = 
+      (uintptr_t)__sync_val_compare_and_swap((uintptr_t)&lock, currentLock, 
+                                             (id + 1));
     if (val != currentLock) {
       if (val & FatMask) {
 end:
         }
         
         currentLock = lock & ThinMask;
-        uintptr_t test = (uintptr_t)__sync_val_compare_and_swap(&lock, currentLock, val);
+        uintptr_t test = 
+          (uintptr_t)__sync_val_compare_and_swap((uintptr_t)&lock, currentLock,
+                                                 val);
         if (test != currentLock) goto loop;
         obj->acquire();
       }