diff options
| -rw-r--r-- | llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h | 6 | ||||
| -rw-r--r-- | llvm/lib/DebugInfo/PDB/Native/TpiStream.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h b/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h index 5c98be1bb93..c2996ccf182 100644 --- a/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h +++ b/llvm/include/llvm/DebugInfo/PDB/Native/TpiHashing.h @@ -21,19 +21,19 @@ Expected<uint32_t> hashTypeRecord(const llvm::codeview::CVType &Type); struct TagRecordHash { explicit TagRecordHash(codeview::ClassRecord CR, uint32_t Full, uint32_t Forward) - : Class(std::move(CR)), FullRecordHash(Full), ForwardDeclHash(Forward) { + : FullRecordHash(Full), ForwardDeclHash(Forward), Class(std::move(CR)) { State = 0; } explicit TagRecordHash(codeview::EnumRecord ER, uint32_t Full, uint32_t Forward) - : Enum(std::move(ER)), FullRecordHash(Full), ForwardDeclHash(Forward) { + : FullRecordHash(Full), ForwardDeclHash(Forward), Enum(std::move(ER)) { State = 1; } explicit TagRecordHash(codeview::UnionRecord UR, uint32_t Full, uint32_t Forward) - : Union(std::move(UR)), FullRecordHash(Full), ForwardDeclHash(Forward) { + : FullRecordHash(Full), ForwardDeclHash(Forward), Union(std::move(UR)) { State = 2; } diff --git a/llvm/lib/DebugInfo/PDB/Native/TpiStream.cpp b/llvm/lib/DebugInfo/PDB/Native/TpiStream.cpp index de0f888137f..311c3859acf 100644 --- a/llvm/lib/DebugInfo/PDB/Native/TpiStream.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/TpiStream.cpp @@ -200,7 +200,6 @@ TpiStream::findFullDeclForForwardRef(TypeIndex ForwardRefTI) const { if (!ForwardTRH) return ForwardTRH.takeError(); - TagRecordHash Copy = std::move(*ForwardTRH); uint32_t BucketIdx = ForwardTRH->FullRecordHash % Header->NumHashBuckets; for (TypeIndex TI : HashMap[BucketIdx]) { |
