diff options
| -rw-r--r-- | llvm/include/llvm/Object/COFF.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Object/COFFObjectFile.cpp | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/llvm/include/llvm/Object/COFF.h b/llvm/include/llvm/Object/COFF.h index fa5785562b7..1a0f9441e2a 100644 --- a/llvm/include/llvm/Object/COFF.h +++ b/llvm/include/llvm/Object/COFF.h @@ -1172,8 +1172,8 @@ public: private: BinaryByteStream BBS; - ErrorOr<const coff_resource_dir_table &> getTableAtOffset(uint32_t Offset); - ErrorOr<ArrayRef<UTF16>> getDirStringAtOffset(uint32_t Offset); + Expected<const coff_resource_dir_table &> getTableAtOffset(uint32_t Offset); + Expected<ArrayRef<UTF16>> getDirStringAtOffset(uint32_t Offset); }; // Corresponds to `_FPO_DATA` structure in the PE/COFF spec. diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp index e139f64db6b..1257d1c79bd 100644 --- a/llvm/lib/Object/COFFObjectFile.cpp +++ b/llvm/lib/Object/COFFObjectFile.cpp @@ -1633,11 +1633,12 @@ std::error_code BaseRelocRef::getRVA(uint32_t &Result) const { return std::error_code(); } -#define RETURN_IF_ERROR(X) \ - if (auto EC = errorToErrorCode(X)) \ - return EC; +#define RETURN_IF_ERROR(E) \ + if (E) \ + return E; -ErrorOr<ArrayRef<UTF16>> ResourceSectionRef::getDirStringAtOffset(uint32_t Offset) { +Expected<ArrayRef<UTF16>> +ResourceSectionRef::getDirStringAtOffset(uint32_t Offset) { BinaryStreamReader Reader = BinaryStreamReader(BBS); Reader.setOffset(Offset); uint16_t Length; @@ -1649,10 +1650,11 @@ ErrorOr<ArrayRef<UTF16>> ResourceSectionRef::getDirStringAtOffset(uint32_t Offse ErrorOr<ArrayRef<UTF16>> ResourceSectionRef::getEntryNameString(const coff_resource_dir_entry &Entry) { - return getDirStringAtOffset(Entry.Identifier.getNameOffset()); + return expectedToErrorOr( + getDirStringAtOffset(Entry.Identifier.getNameOffset())); } -ErrorOr<const coff_resource_dir_table &> +Expected<const coff_resource_dir_table &> ResourceSectionRef::getTableAtOffset(uint32_t Offset) { const coff_resource_dir_table *Table = nullptr; @@ -1665,9 +1667,9 @@ ResourceSectionRef::getTableAtOffset(uint32_t Offset) { ErrorOr<const coff_resource_dir_table &> ResourceSectionRef::getEntrySubDir(const coff_resource_dir_entry &Entry) { - return getTableAtOffset(Entry.Offset.value()); + return expectedToErrorOr(getTableAtOffset(Entry.Offset.value())); } ErrorOr<const coff_resource_dir_table &> ResourceSectionRef::getBaseTable() { - return getTableAtOffset(0); + return expectedToErrorOr(getTableAtOffset(0)); } |
