Skip to content

Commit f439aee

Browse files
committed
[LLVM-3.9] Use old way of getting next child
This was changed back in rust-lang/llvm@aacf2fbf
1 parent d0e5aa4 commit f439aee

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/rustllvm/ArchiveWrapper.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ extern "C" RustArchiveIterator*
7979
LLVMRustArchiveIteratorNew(RustArchive *ra) {
8080
Archive *ar = ra->getBinary();
8181
RustArchiveIterator *rai = new RustArchiveIterator();
82+
#if LLVM_VERSION_MINOR >= 9
83+
Error err;
84+
rai->cur = ar->child_begin(err);
85+
#else
8286
rai->cur = ar->child_begin();
87+
#endif
8388
rai->end = ar->child_end();
8489
return rai;
8590
}
@@ -88,8 +93,8 @@ extern "C" const Archive::Child*
8893
LLVMRustArchiveIteratorNext(RustArchiveIterator *rai) {
8994
if (rai->cur == rai->end)
9095
return NULL;
91-
#if LLVM_VERSION_MINOR >= 8
92-
const ErrorOr<Archive::Child>* cur = rai->cur.operator->();
96+
#if LLVM_VERSION_MINOR == 8
97+
Archive::Child* cur = rai->cur.operator->();
9398
if (!*cur) {
9499
LLVMRustSetLastError(cur->getError().message().c_str());
95100
return NULL;

0 commit comments

Comments
 (0)