RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

LTOModule::isBitcodeFile() shouldn't assert when returning false.

Browse Source 
Fixes a bunch of assert-on-invalid-bitcode regressions after 315483.
Expected<> calls assertIsChecked() in its dtor, and operator bool() only calls
setChecked() if there's no error. So for functions that don't return an error
itself, the Expected<> version needs explicit code to disarm the error that the
ErrorOr<> code didn't need.

https://reviews.llvm.org/D39437

llvm-svn: 317010
This commit is contained in:
Nico Weber 2017-10-31 16:39:47 +00:00
parent c03d168784
commit 9406190dba
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/LTO/LTOModule.cpp
View File

@ -62,7 +62,11 @@ LTOModule::~LTOModule() {}
bool LTOModule::isBitcodeFile(const void *Mem, size_t Length) { bool LTOModule::isBitcodeFile(const void *Mem, size_t Length) {
Expected<MemoryBufferRef> BCData = IRObjectFile::findBitcodeInMemBuffer( Expected<MemoryBufferRef> BCData = IRObjectFile::findBitcodeInMemBuffer(
MemoryBufferRef(StringRef((const char *)Mem, Length), "<mem>")); MemoryBufferRef(StringRef((const char *)Mem, Length), "<mem>"));
return bool(BCData); if (!BCData) {
consumeError(BCData.takeError());
return false;
}
return true;
} }
bool LTOModule::isBitcodeFile(StringRef Path) { bool LTOModule::isBitcodeFile(StringRef Path) {
@ -73,7 +77,11 @@ bool LTOModule::isBitcodeFile(StringRef Path) {
Expected<MemoryBufferRef> BCData = IRObjectFile::findBitcodeInMemBuffer( Expected<MemoryBufferRef> BCData = IRObjectFile::findBitcodeInMemBuffer(
BufferOrErr.get()->getMemBufferRef()); BufferOrErr.get()->getMemBufferRef());
return bool(BCData); if (!BCData) {
consumeError(BCData.takeError());
return false;
}
return true;
} }
bool LTOModule::isThinLTO() { bool LTOModule::isThinLTO() {
@ -89,8 +97,10 @@ bool LTOModule::isBitcodeForTarget(MemoryBuffer *Buffer,
StringRef TriplePrefix) { StringRef TriplePrefix) {
Expected<MemoryBufferRef> BCOrErr = Expected<MemoryBufferRef> BCOrErr =
IRObjectFile::findBitcodeInMemBuffer(Buffer->getMemBufferRef()); IRObjectFile::findBitcodeInMemBuffer(Buffer->getMemBufferRef());
if (!BCOrErr) if (!BCOrErr) {
consumeError(BCOrErr.takeError());
return false; return false;
}
LLVMContext Context; LLVMContext Context;
ErrorOr<std::string> TripleOrErr = ErrorOr<std::string> TripleOrErr =
expectedToErrorOrAndEmitErrors(Context, getBitcodeTargetTriple(*BCOrErr)); expectedToErrorOrAndEmitErrors(Context, getBitcodeTargetTriple(*BCOrErr));
@ -102,8 +112,10 @@ bool LTOModule::isBitcodeForTarget(MemoryBuffer *Buffer,
std::string LTOModule::getProducerString(MemoryBuffer *Buffer) { std::string LTOModule::getProducerString(MemoryBuffer *Buffer) {
Expected<MemoryBufferRef> BCOrErr = Expected<MemoryBufferRef> BCOrErr =
IRObjectFile::findBitcodeInMemBuffer(Buffer->getMemBufferRef()); IRObjectFile::findBitcodeInMemBuffer(Buffer->getMemBufferRef());
if (!BCOrErr) if (!BCOrErr) {
consumeError(BCOrErr.takeError());
return ""; return "";
}
LLVMContext Context; LLVMContext Context;
ErrorOr<std::string> ProducerOrErr = expectedToErrorOrAndEmitErrors( ErrorOr<std::string> ProducerOrErr = expectedToErrorOrAndEmitErrors(
Context, getBitcodeProducerString(*BCOrErr)); Context, getBitcodeProducerString(*BCOrErr));

4
test/tools/lto/no-bitcode.s Normal file
View File

@ -0,0 +1,4 @@
; libLTO.dylib shouldn't assert on invalid inputs.
; RUN: llvm-mc -triple=arm64-apple-ios7.0.0 -filetype=obj -o %t.o
; RUN: llvm-ar r %t.a %t.o
; RUN: %ld64 -lto_library %llvmshlibdir/libLTO.dylib -arch x86_64 -dylib -mllvm -O0 -o %t.dylib %t.a