bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #16520 : dotdash/rust/fix_llvm_before_36, r=thestinger

Browse source
This commit is contained in:
bors 2014-08-16 08:56:11 +00:00
commit ec9476cd63
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

@ -282,7 +282,11 @@ extern "C" LLVMValueRef LLVMDIBuilderCreateSubroutineType(
LLVMValueRef ParameterTypes) {
return wrap(Builder->createSubroutineType(
unwrapDI<DIFile>(File),
#if LLVM_VERSION_MINOR >= 6
unwrapDI<DITypeArray>(ParameterTypes)));
#else
unwrapDI<DIArray>(ParameterTypes)));
#endif
}
extern "C" LLVMValueRef LLVMDIBuilderCreateFunction(
@ -634,7 +638,11 @@ extern "C" void LLVMDICompositeTypeSetTypeArray(
LLVMValueRef CompositeType,
LLVMValueRef TypeArray)
{
#if LLVM_VERSION_MINOR >= 6
unwrapDI<DICompositeType>(CompositeType).setArrays(unwrapDI<DIArray>(TypeArray));
#else
unwrapDI<DICompositeType>(CompositeType).setTypeArray(unwrapDI<DIArray>(TypeArray));
#endif
}
extern "C" char *LLVMTypeToString(LLVMTypeRef Type) {