diff options
Diffstat (limited to 'llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp')
| -rw-r--r-- | llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp | 71 |
1 files changed, 41 insertions, 30 deletions
diff --git a/llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp b/llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp index be4ce56ab15..e1a248a609f 100644 --- a/llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp +++ b/llvm/lib/DebugInfo/PDB/Raw/NameMap.cpp @@ -22,9 +22,10 @@ Error NameMap::load(codeview::StreamReader &Stream) { // This is some sort of weird string-set/hash table encoded in the stream. // It starts with the number of bytes in the table. uint32_t NumberOfBytes; - if (Stream.readInteger(NumberOfBytes)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map length"); + if (auto EC = Stream.readInteger(NumberOfBytes)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map length")); if (Stream.bytesRemaining() < NumberOfBytes) return make_error<RawError>(raw_error_code::corrupt_file, "Invalid name map length"); @@ -36,31 +37,35 @@ Error NameMap::load(codeview::StreamReader &Stream) { // This appears to be equivalent to the total number of strings *actually* // in the name table. uint32_t HashSize; - if (Stream.readInteger(HashSize)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map hash size"); + if (auto EC = Stream.readInteger(HashSize)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map hash size")); // This appears to be an upper bound on the number of strings in the name // table. uint32_t MaxNumberOfStrings; - if (Stream.readInteger(MaxNumberOfStrings)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map max strings"); + if (auto EC = Stream.readInteger(MaxNumberOfStrings)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map max strings")); // This appears to be a hash table which uses bitfields to determine whether // or not a bucket is 'present'. uint32_t NumPresentWords; - if (Stream.readInteger(NumPresentWords)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map num words"); + if (auto EC = Stream.readInteger(NumPresentWords)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map num words")); // Store all the 'present' bits in a vector for later processing. SmallVector<uint32_t, 1> PresentWords; for (uint32_t I = 0; I != NumPresentWords; ++I) { uint32_t Word; - if (Stream.readInteger(Word)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map word"); + if (auto EC = Stream.readInteger(Word)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map word")); PresentWords.push_back(Word); } @@ -68,17 +73,20 @@ Error NameMap::load(codeview::StreamReader &Stream) { // This appears to be a hash table which uses bitfields to determine whether // or not a bucket is 'deleted'. uint32_t NumDeletedWords; - if (Stream.readInteger(NumDeletedWords)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map num deleted words"); + if (auto EC = Stream.readInteger(NumDeletedWords)) + return joinErrors( + std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map num deleted words")); // Store all the 'deleted' bits in a vector for later processing. SmallVector<uint32_t, 1> DeletedWords; for (uint32_t I = 0; I != NumDeletedWords; ++I) { uint32_t Word; - if (Stream.readInteger(Word)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map deleted word"); + if (auto EC = Stream.readInteger(Word)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map deleted word")); DeletedWords.push_back(Word); } @@ -99,15 +107,17 @@ Error NameMap::load(codeview::StreamReader &Stream) { // This appears to be an offset relative to the start of the strings. // It tells us where the null-terminated string begins. uint32_t NameOffset; - if (Stream.readInteger(NameOffset)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map name offset"); + if (auto EC = Stream.readInteger(NameOffset)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map name offset")); // This appears to be a stream number into the stream directory. uint32_t NameIndex; - if (Stream.readInteger(NameIndex)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map name index"); + if (auto EC = Stream.readInteger(NameIndex)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map name index")); // Compute the offset of the start of the string relative to the stream. uint32_t StringOffset = StringsOffset + NameOffset; @@ -115,9 +125,10 @@ Error NameMap::load(codeview::StreamReader &Stream) { // Pump out our c-string from the stream. StringRef Str; Stream.setOffset(StringOffset); - if (Stream.readZeroString(Str)) - return make_error<RawError>(raw_error_code::corrupt_file, - "Expected name map name"); + if (auto EC = Stream.readZeroString(Str)) + return joinErrors(std::move(EC), + make_error<RawError>(raw_error_code::corrupt_file, + "Expected name map name")); Stream.setOffset(OldOffset); // Add this to a string-map from name to stream number. |
