Skip to content

Commit 09c3f33

Browse files
committed
Flip LLVM verion check clause
1 parent f439aee commit 09c3f33

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/rustllvm/ArchiveWrapper.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ extern "C" RustArchiveIterator*
7979
LLVMRustArchiveIteratorNew(RustArchive *ra) {
8080
Archive *ar = ra->getBinary();
8181
RustArchiveIterator *rai = new RustArchiveIterator();
82-
#if LLVM_VERSION_MINOR >= 9
82+
#if LLVM_VERSION_MINOR <= 8
83+
rai->cur = ar->child_begin();
84+
#else
8385
Error err;
8486
rai->cur = ar->child_begin(err);
85-
#else
86-
rai->cur = ar->child_begin();
8787
#endif
8888
rai->end = ar->child_end();
8989
return rai;
@@ -164,10 +164,10 @@ LLVMRustWriteArchive(char *Dst,
164164
bool WriteSymbtab,
165165
Archive::Kind Kind) {
166166

167-
#if LLVM_VERSION_MINOR >= 9
168-
std::vector<NewArchiveMember> Members;
169-
#else
167+
#if LLVM_VERSION_MINOR <= 8
170168
std::vector<NewArchiveIterator> Members;
169+
#else
170+
std::vector<NewArchiveMember> Members;
171171
#endif
172172

173173
for (size_t i = 0; i < NumMembers; i++) {
@@ -187,15 +187,15 @@ LLVMRustWriteArchive(char *Dst,
187187
Members.push_back(NewArchiveIterator(Member->filename, Member->name));
188188
#endif
189189
} else {
190-
#if LLVM_VERSION_MINOR >= 9
190+
#if LLVM_VERSION_MINOR <= 8
191+
Members.push_back(NewArchiveIterator(Member->child, Member->name));
192+
#else
191193
Expected<NewArchiveMember> MOrErr = NewArchiveMember::getOldMember(Member->child, true);
192194
if (!MOrErr) {
193195
LLVMRustSetLastError(toString(MOrErr.takeError()).c_str());
194196
return -1;
195197
}
196198
Members.push_back(std::move(*MOrErr));
197-
#else
198-
Members.push_back(NewArchiveIterator(Member->child, Member->name));
199199
#endif
200200
}
201201
}

0 commit comments

Comments
 (0)