bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Updated LLVM for iOS

Browse source 
There should be no more problems during SjLj pass
This commit is contained in:
Valerii Hiora 2014-07-23 09:14:58 +03:00 • committed by Alex Crichton
parent 4ea1dd5494
commit 57cade5744
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/rustllvm/RustWrapper.cpp
View file

@ -658,13 +658,14 @@ LLVMRustLinkInExternalBitcode(LLVMModuleRef dst, char *bc, size_t len) {
#if LLVM_VERSION_MINOR >= 5
extern "C" void*
LLVMRustOpenArchive(char *path) {
std::unique_ptr<MemoryBuffer> buf;
std::error_code err = MemoryBuffer::getFile(path, buf);
if (err) {
LLVMRustSetLastError(err.message().c_str());
ErrorOr<std::unique_ptr<MemoryBuffer>> buf_or = MemoryBuffer::getFile(path);
if (!buf_or) {
LLVMRustSetLastError(buf_or.getError().message().c_str());
return NULL;
}
Archive *ret = new Archive(buf.release(), err);
std::error_code err;
Archive *ret = new Archive(std::move(buf_or.get()), err);
if (err) {
LLVMRustSetLastError(err.message().c_str());
return NULL;