From f43f9d0ef861d1cc26fdf85a2e79880973bec88b Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Tue, 23 Jun 2009 18:30:27 +0000
Subject: [PATCH] Atomic ops that do arithmetic use signed arithmetic.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73980 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/System/Atomic.h | 8 ++++----
 include/llvm/Type.h          | 4 ++--
 lib/System/Atomic.cpp        | 8 ++++----
 lib/VMCore/Mangler.cpp       | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/llvm/System/Atomic.h b/include/llvm/System/Atomic.h
index a94ad2d92e5..c0612f9976c 100644
--- a/include/llvm/System/Atomic.h
+++ b/include/llvm/System/Atomic.h
@@ -23,11 +23,11 @@ namespace llvm {
     uint32_t CompareAndSwap32(volatile uint32_t* ptr,
                             uint32_t new_value,
                             uint32_t old_value);
-    uint32_t AtomicIncrement32(volatile uint32_t* ptr);
-    uint32_t AtomicDecrement32(volatile uint32_t* ptr);
-    uint32_t AtomicAdd32(volatile uint32_t* ptr, uint32_t val);
+    int32_t AtomicIncrement32(volatile int32_t* ptr);
+    int32_t AtomicDecrement32(volatile int32_t* ptr);
+    int32_t AtomicAdd32(volatile int32_t* ptr, int32_t val);
     
-    uint64_t AtomicAdd64(volatile uint64_t* ptr, uint64_t val);
+    int64_t AtomicAdd64(volatile int64_t* ptr, int64_t val);
   }
 }
 
diff --git a/include/llvm/Type.h b/include/llvm/Type.h
index 8c07b3e2a06..97d5043dc41 100644
--- a/include/llvm/Type.h
+++ b/include/llvm/Type.h
@@ -103,7 +103,7 @@ private:
   /// has no AbstractTypeUsers, the type is deleted.  This is only sensical for
   /// derived types.
   ///
-  mutable uint32_t RefCount;
+  mutable int32_t RefCount;
 
   const Type *getForwardedTypeInternal() const;
 
@@ -347,7 +347,7 @@ public:
 
     // If this is the last PATypeHolder using this object, and there are no
     // PATypeHandles using it, the type is dead, delete it now.
-    uint32_t Count = sys::AtomicDecrement32(&RefCount);
+    int32_t Count = sys::AtomicDecrement32(&RefCount);
     if (Count == 0 && AbstractTypeUsers.empty())
       this->destroy();
   }
diff --git a/lib/System/Atomic.cpp b/lib/System/Atomic.cpp
index 65e14697ede..fda27088da1 100644
--- a/lib/System/Atomic.cpp
+++ b/lib/System/Atomic.cpp
@@ -52,7 +52,7 @@ uint32_t sys::CompareAndSwap32(volatile uint32_t* ptr,
 #endif
 }
 
-uint32_t sys::AtomicIncrement32(volatile uint32_t* ptr) {
+int32_t sys::AtomicIncrement32(volatile int32_t* ptr) {
 #if LLVM_MULTITHREADED==0
   ++(*ptr);
   return *ptr;
@@ -65,7 +65,7 @@ uint32_t sys::AtomicIncrement32(volatile uint32_t* ptr) {
 #endif
 }
 
-uint32_t sys::AtomicDecrement32(volatile uint32_t* ptr) {
+int32_t sys::AtomicDecrement32(volatile int32_t* ptr) {
 #if LLVM_MULTITHREADED==0
   --(*ptr);
   return *ptr;
@@ -78,7 +78,7 @@ uint32_t sys::AtomicDecrement32(volatile uint32_t* ptr) {
 #endif
 }
 
-uint32_t sys::AtomicAdd32(volatile uint32_t* ptr, uint32_t val) {
+int32_t sys::AtomicAdd32(volatile int32_t* ptr, int32_t val) {
 #if LLVM_MULTITHREADED==0
   *ptr += val;
   return *ptr;
@@ -91,7 +91,7 @@ uint32_t sys::AtomicAdd32(volatile uint32_t* ptr, uint32_t val) {
 #endif
 }
 
-uint64_t sys::AtomicAdd64(volatile uint64_t* ptr, uint64_t val) {
+int64_t sys::AtomicAdd64(volatile int64_t* ptr, int64_t val) {
 #if LLVM_MULTITHREADED==0
   *ptr += val;
   return *ptr;
diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 0f6f216ceb8..6be06d22168 100644
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -165,9 +165,9 @@ std::string Mangler::getValueName(const GlobalValue *GV, const char * Suffix) {
   } else if (!GV->hasName()) {
     // Must mangle the global into a unique ID.
     unsigned TypeUniqueID = getTypeID(GV->getType());
-    static uint32_t GlobalID = 0;
+    static int32_t GlobalID = 0;
     
-    unsigned OldID = GlobalID;
+    int32_t OldID = GlobalID;
     sys::AtomicIncrement32(&GlobalID);
     
     Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(OldID);
-- 
2.34.1