[llvm] r206675 - OnDiskHashTable: Audit types and use offset_type consistently
Justin Bogner
mail at justinbogner.com
Fri Apr 18 17:33:15 PDT 2014
Author: bogner
Date: Fri Apr 18 19:33:15 2014
New Revision: 206675
URL: http://llvm.org/viewvc/llvm-project?rev=206675&view=rev
Log:
OnDiskHashTable: Audit types and use offset_type consistently
Modified:
llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
llvm/trunk/include/llvm/Support/OnDiskHashTable.h
llvm/trunk/lib/ProfileData/InstrProfWriter.cpp
Modified: llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProfReader.h?rev=206675&r1=206674&r2=206675&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProfReader.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProfReader.h Fri Apr 18 19:33:15 2014
@@ -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();
Modified: llvm/trunk/include/llvm/Support/OnDiskHashTable.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/OnDiskHashTable.h?rev=206675&r1=206674&r2=206675&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/OnDiskHashTable.h (original)
+++ llvm/trunk/include/llvm/Support/OnDiskHashTable.h Fri Apr 18 19:33:15 2014
@@ -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) {}
Modified: llvm/trunk/lib/ProfileData/InstrProfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfWriter.cpp?rev=206675&r1=206674&r2=206675&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProfWriter.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProfWriter.cpp Fri Apr 18 19:33:15 2014
@@ -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);
More information about the llvm-commits
mailing list