Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-09 09:32:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Try to appease the Windows build bots.

Browse Source 
Several of the conditonal operators commited in llvm-svn: 365524 fail to compile
on the windows buildbots. Converting to an if and early return to try to fix.

llvm-svn: 365535
This commit is contained in:
Sean Fertile 2019-07-09 18:44:28 +00:00
parent 95176d72c7
commit 210314ae8c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Object/XCOFFObjectFile.cpp
View File

@ -189,8 +189,12 @@ Expected<StringRef> XCOFFObjectFile::getSectionName(DataRefImpl Sec) const {
}
uint64_t XCOFFObjectFile::getSectionAddress(DataRefImpl Sec) const {
return is64Bit() ? toSection64(Sec)->VirtualAddress
: toSection32(Sec)->VirtualAddress;
// Avoid ternary due to failure to convert the ubig32_t value to a unit64_t
// with MSVC.
if (is64Bit())
return toSection64(Sec)->VirtualAddress;
return toSection32(Sec)->VirtualAddress;
}
uint64_t XCOFFObjectFile::getSectionIndex(DataRefImpl Sec) const {
@ -203,8 +207,12 @@ uint64_t XCOFFObjectFile::getSectionIndex(DataRefImpl Sec) const {
}
uint64_t XCOFFObjectFile::getSectionSize(DataRefImpl Sec) const {
return is64Bit() ? toSection64(Sec)->SectionSize
: toSection32(Sec)->SectionSize;
// Avoid ternary due to failure to convert the ubig32_t value to a unit64_t
// with MSVC.
if (is64Bit())
return toSection64(Sec)->SectionSize;
return toSection32(Sec)->SectionSize;
}
Expected<ArrayRef<uint8_t>>