maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC] Minor cleanups in CodeView TypeTableBuilder. 

llvm-svn: 319260
This commit is contained in:
Zachary Turner 2017-11-28 23:57:13 +00:00
parent 88ffb5d4d5
commit 29b081dcd1
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h
View File

@ -35,7 +35,7 @@ namespace codeview {
class ContinuationRecordBuilder;
class TypeHasher;
class TypeTableBuilder : public TypeVisitorCallbacks {
class TypeTableBuilder {
BumpPtrAllocator &RecordStorage;
SimpleTypeSerializer SimpleSerializer;
@ -52,7 +52,7 @@ class TypeTableBuilder : public TypeVisitorCallbacks {
public:
explicit TypeTableBuilder(BumpPtrAllocator &Storage, bool Hash = true);
~TypeTableBuilder() override;
~TypeTableBuilder();
void reset();

17
llvm/lib/DebugInfo/CodeView/TypeTableBuilder.cpp
View File

@ -31,9 +31,8 @@ using namespace llvm::codeview;
namespace {
struct HashedType {
uint64_t Hash;
const uint8_t *Data;
unsigned Size; // FIXME: Go to uint16_t?
unsigned Hash;
ArrayRef<uint8_t> Data;
TypeIndex Index;
};
@ -67,9 +66,9 @@ template <> struct DenseMapInfo<HashedTypePtr> {
HashedType *RHS = RHSP.Ptr;
if (RHS == getEmptyKey().Ptr || RHS == getTombstoneKey().Ptr)
return LHS == RHS;
if (LHS->Hash != RHS->Hash || LHS->Size != RHS->Size)
if (LHS->Hash != RHS->Hash)
return false;
return ::memcmp(LHS->Data, RHS->Data, LHS->Size) == 0;
return LHS->Data == RHS->Data;
}
};
@ -111,8 +110,7 @@ TypeIndex TypeHasher::getOrCreateRecord(ArrayRef<uint8_t> &Record,
assert(Record.size() % 4 == 0 && "Record is not aligned to 4 bytes!");
// Compute the hash up front so we can store it in the key.
HashedType TempHashedType = {hash_value(Record), Record.data(),
unsigned(Record.size()), TI};
HashedType TempHashedType = {hash_value(Record), Record, TI};
auto Result = HashedRecords.insert(HashedTypePtr(&TempHashedType));
HashedType *&Hashed = Result.first->Ptr;
@ -124,12 +122,11 @@ TypeIndex TypeHasher::getOrCreateRecord(ArrayRef<uint8_t> &Record,
uint8_t *Stable = RecordStorage.Allocate<uint8_t>(Record.size());
memcpy(Stable, Record.data(), Record.size());
Hashed->Data = Stable;
assert(Hashed->Size == Record.size());
Hashed->Data = makeArrayRef(Stable, Record.size());
}
// Update the caller's copy of Record to point a stable copy.
Record = ArrayRef<uint8_t>(Hashed->Data, Hashed->Size);
Record = Hashed->Data;
return Hashed->Index;
}