4 files changed, 5 insertions, 16 deletions
diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index 375b655b4d..e66fc69345 100644
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -55,11 +55,7 @@ static inline std::string utostr(uint64_t X, bool isNeg = false) {
   return std::string(BufPtr);
 }
 
-static inline std::string utostr(unsigned long X, bool isNeg = false) {
-  return utostr(static_cast<uint64_t>(X), isNeg);
-}
-
-static inline std::string utostr(unsigned X, bool isNeg = false) {
+static inline std::string utostr(uint32_t X, bool isNeg = false) {
   char Buffer[20];
   char *BufPtr = Buffer+19;
 
@@ -83,14 +79,7 @@ static inline std::string itostr(int64_t X) {
     return utostr(static_cast<uint64_t>(X));
 }
 
-static inline std::string itostr(long X) {
-  if (X < 0)
-    return utostr(static_cast<uint64_t>(-X), true);
-  else
-    return utostr(static_cast<uint64_t>(X));
-}
-
-static inline std::string itostr(int X) {
+static inline std::string itostr(int32_t X) {
   if (X < 0)
     return utostr(static_cast<unsigned>(-X), true);
   else
diff --git a/include/llvm/SymbolTable.h b/include/llvm/SymbolTable.h
index 04f009681c..5083243c36 100644
--- a/include/llvm/SymbolTable.h
+++ b/include/llvm/SymbolTable.h
@@ -292,7 +292,7 @@ private:
 
   /// This value is used to retain the last unique value used
   /// by getUniqueName to generate unique names.
-  mutable unsigned long LastUnique;
+  mutable uint64_t LastUnique;
 
 /// @}
 
diff --git a/include/llvm/TypeSymbolTable.h b/include/llvm/TypeSymbolTable.h
index a31525bdc7..8a494562d3 100644
--- a/include/llvm/TypeSymbolTable.h
+++ b/include/llvm/TypeSymbolTable.h
@@ -138,7 +138,7 @@ private:
 /// @{
 private:
   TypeMap tmap; ///< This is the mapping of names to types.
-  mutable unsigned long LastUnique; ///< Counter for tracking unique names
+  mutable uint64_t LastUnique; ///< Counter for tracking unique names
 
 /// @}
 
diff --git a/include/llvm/ValueSymbolTable.h b/include/llvm/ValueSymbolTable.h
index df3fe18197..34fa28bd5a 100644
--- a/include/llvm/ValueSymbolTable.h
+++ b/include/llvm/ValueSymbolTable.h
@@ -127,7 +127,7 @@ public:
 /// @{
 private:
   ValueMap vmap;                    ///< The map that holds the symbol table.
-  mutable unsigned long LastUnique; ///< Counter for tracking unique names
+  mutable uint64_t LastUnique; ///< Counter for tracking unique names
 
 /// @}