nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert the last uses of ErrorOr in COFF.h.

Browse Source 
llvm-svn: 315480
This commit is contained in:
Rafael Espindola
2017-10-11 17:33:11 +00:00
parent b751082d56
commit f340467495
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/Object/COFFObjectFile.cpp
View File

@@ -1648,10 +1648,9 @@ ResourceSectionRef::getDirStringAtOffset(uint32_t Offset) {
return RawDirString;
}
ErrorOr<ArrayRef<UTF16>>
Expected<ArrayRef<UTF16>>
ResourceSectionRef::getEntryNameString(const coff_resource_dir_entry &Entry) {
return expectedToErrorOr(
getDirStringAtOffset(Entry.Identifier.getNameOffset()));
return getDirStringAtOffset(Entry.Identifier.getNameOffset());
}
Expected<const coff_resource_dir_table &>
@@ -1665,11 +1664,11 @@ ResourceSectionRef::getTableAtOffset(uint32_t Offset) {
return *Table;
}
ErrorOr<const coff_resource_dir_table &>
Expected<const coff_resource_dir_table &>
ResourceSectionRef::getEntrySubDir(const coff_resource_dir_entry &Entry) {
return expectedToErrorOr(getTableAtOffset(Entry.Offset.value()));
return getTableAtOffset(Entry.Offset.value());
}
ErrorOr<const coff_resource_dir_table &> ResourceSectionRef::getBaseTable() {
return expectedToErrorOr(getTableAtOffset(0));
Expected<const coff_resource_dir_table &> ResourceSectionRef::getBaseTable() {
return getTableAtOffset(0);
}