bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Support LLVM 4.0 in OptimizationDiagnostic FFI

Browse source 
- getMsg() changed to return std::string by-value. Fix: copy the data to a rust String during unpacking.
- getPassName() changed to return StringRef
This commit is contained in:
Robin Kruppe 2016-11-24 17:33:47 +01:00
parent 29abe6f9e8
commit 730400167a
4 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/rustllvm/RustWrapper.cpp
View file

@ -871,16 +871,21 @@ LLVMRustUnpackOptimizationDiagnostic(
const char **pass_name_out,
LLVMValueRef *function_out,
LLVMDebugLocRef *debugloc_out,
LLVMTwineRef *message_out)
RustStringRef message_out)
{
// Undefined to call this not on an optimization diagnostic!
llvm::DiagnosticInfoOptimizationBase *opt
= static_cast<llvm::DiagnosticInfoOptimizationBase*>(unwrap(di));
#if LLVM_VERSION_GE(4, 0)
*pass_name_out = opt->getPassName().data();
#else
*pass_name_out = opt->getPassName();
#endif
*function_out = wrap(&opt->getFunction());
*debugloc_out = wrap(&opt->getDebugLoc());
*message_out = wrap(&opt->getMsg());
raw_rust_string_ostream os(message_out);
os << opt->getMsg();
}
extern "C" void