bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Handle switch to Expected<StringRef> for section name

Browse source
This commit is contained in:
Nikita Popov 2019-12-31 14:28:56 +01:00
parent aa9d02ea53
commit 6d59017132
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rustllvm/RustWrapper.cpp
View file

@ -1003,11 +1003,19 @@ inline section_iterator *unwrap(LLVMSectionIteratorRef SI) {
extern "C" size_t LLVMRustGetSectionName(LLVMSectionIteratorRef SI,
const char **Ptr) {
#if LLVM_VERSION_GE(10, 0)
auto NameOrErr = (*unwrap(SI))->getName();
if (!NameOrErr)
report_fatal_error(NameOrErr.takeError());
*Ptr = NameOrErr->data();
return NameOrErr->size();
#else
StringRef Ret;
if (std::error_code EC = (*unwrap(SI))->getName(Ret))
report_fatal_error(EC.message());
*Ptr = Ret.data();
return Ret.size();
#endif
}
// LLVMArrayType function does not support 64-bit ElementCount