Skip to content

Commit 522370a

Browse files
committed
Updated LLVM for iOS
There should be no more problems during SjLj pass
1 parent 217f1fb commit 522370a

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/llvm

Submodule llvm updated 1594 files

src/rustllvm/RustWrapper.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -658,13 +658,14 @@ LLVMRustLinkInExternalBitcode(LLVMModuleRef dst, char *bc, size_t len) {
658658
#if LLVM_VERSION_MINOR >= 5
659659
extern "C" void*
660660
LLVMRustOpenArchive(char *path) {
661-
std::unique_ptr<MemoryBuffer> buf;
662-
std::error_code err = MemoryBuffer::getFile(path, buf);
663-
if (err) {
664-
LLVMRustSetLastError(err.message().c_str());
661+
ErrorOr<std::unique_ptr<MemoryBuffer>> buf_or = MemoryBuffer::getFile(path);
662+
if (!buf_or) {
663+
LLVMRustSetLastError(buf_or.getError().message().c_str());
665664
return NULL;
666665
}
667-
Archive *ret = new Archive(buf.release(), err);
666+
667+
std::error_code err;
668+
Archive *ret = new Archive(std::move(buf_or.get()), err);
668669
if (err) {
669670
LLVMRustSetLastError(err.message().c_str());
670671
return NULL;

src/rustllvm/llvm-auto-clean-trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2014-07-21
4+
2014-07-22

0 commit comments

Comments
 (0)