OnDiskHashTable: Audit types and use offset_type consistently

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206675 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ProfileData/InstrProfReader.h b/include/llvm/ProfileData/InstrProfReader.h
index 18a7e43437a04bab4866a2e6d1fb0a1805a2efcf..3bb482e20f3d0e57a20f92099a4cb0d769302415 100644 (file)
--- a/include/llvm/ProfileData/InstrProfReader.h
+++ b/include/llvm/ProfileData/InstrProfReader.h
@@ -227,11 +227,11 @@ public:
     return std::make_pair(KeyLen, DataLen);
   }
 
-  StringRef ReadKey(const unsigned char *D, unsigned N) {
+  StringRef ReadKey(const unsigned char *D, offset_type N) {
     return StringRef((const char *)D, N);
   }
 
-  InstrProfRecord ReadData(StringRef K, const unsigned char *D, unsigned N) {
+  InstrProfRecord ReadData(StringRef K, const unsigned char *D, offset_type N) {
     if (N < 2 * sizeof(uint64_t) || N % sizeof(uint64_t)) {
       // The data is corrupt, don't try to read it.
       CountBuffer.clear();

diff --git a/include/llvm/Support/OnDiskHashTable.h b/include/llvm/Support/OnDiskHashTable.h
index 289f7922f2a6090d566fbe1119681c26c56fca5e..14bfd9ad4f963cb9c32f0177f4b6e094e8400da3 100644 (file)
--- a/include/llvm/Support/OnDiskHashTable.h
+++ b/include/llvm/Support/OnDiskHashTable.h
@@ -48,10 +48,11 @@ namespace llvm {
 ///   static std::pair<offset_type, offset_type>
 ///   EmitKeyDataLength(raw_ostream &Out, key_type_ref Key, data_type_ref Data);
 ///   /// Write Key to Out.  KeyLen is the length from EmitKeyDataLength.
-///   static void EmitKey(raw_ostream &Out, key_type_ref Key, unsigned KeyLen);
+///   static void EmitKey(raw_ostream &Out, key_type_ref Key,
+///                       offset_type KeyLen);
 ///   /// Write Data to Out.  DataLen is the length from EmitKeyDataLength.
 ///   static void EmitData(raw_ostream &Out, key_type_ref Key,
-///                        data_type_ref Data, unsigned DataLen);
+///                        data_type_ref Data, offset_type DataLen);
 /// };
 /// \endcode
 template <typename Info> class OnDiskChainedHashTableGenerator {
@@ -227,11 +228,11 @@ public:
 ///   /// Read the key from Buffer, given the KeyLen as reported from
 ///   /// ReadKeyDataLength.
 ///   const internal_key_type &ReadKey(const unsigned char *Buffer,
-///                                    unsigned KeyLen);
+///                                    offset_type KeyLen);
 ///   /// Read the data for Key from Buffer, given the DataLen as reported from
 ///   /// ReadKeyDataLength.
 ///   data_type ReadData(StringRef Key, const unsigned char *Buffer,
-///                      unsigned DataLen);
+///                      offset_type DataLen);
 /// };
 /// \endcode
 template <typename Info> class OnDiskChainedHashTable {
@@ -268,12 +269,12 @@ public:
   class iterator {
     internal_key_type Key;
     const unsigned char *const Data;
-    const unsigned Len;
+    const offset_type Len;
     Info *InfoObj;
 
   public:
     iterator() : Data(0), Len(0) {}
-    iterator(const internal_key_type K, const unsigned char *D, unsigned L,
+    iterator(const internal_key_type K, const unsigned char *D, offset_type L,
              Info *InfoObj)
         : Key(K), Data(D), Len(L), InfoObj(InfoObj) {}
 

diff --git a/lib/ProfileData/InstrProfWriter.cpp b/lib/ProfileData/InstrProfWriter.cpp
index 1a3eae1db9d2f1ad5c948251837192de090af080..19b6890b36bb7565f84446a6df1cc4db706f569b 100644 (file)
--- a/lib/ProfileData/InstrProfWriter.cpp
+++ b/lib/ProfileData/InstrProfWriter.cpp
@@ -42,21 +42,21 @@ public:
     using namespace llvm::support;
     endian::Writer<little> LE(Out);
 
-    unsigned N = K.size();
+    offset_type N = K.size();
     LE.write<offset_type>(N);
 
-    unsigned M = (1 + V.Counts.size()) * sizeof(uint64_t);
+    offset_type M = (1 + V.Counts.size()) * sizeof(uint64_t);
     LE.write<offset_type>(M);
 
     return std::make_pair(N, M);
   }
 
-  static void EmitKey(raw_ostream &Out, key_type_ref K, unsigned N){
+  static void EmitKey(raw_ostream &Out, key_type_ref K, offset_type N){
     Out.write(K.data(), N);
   }
 
   static void EmitData(raw_ostream &Out, key_type_ref, data_type_ref V,
-                       unsigned) {
+                       offset_type) {
     using namespace llvm::support;
     endian::Writer<little> LE(Out);
     LE.write<uint64_t>(V.Hash);