Skip to content

Commit 449219a

Browse files
committed
isolate llvm 4.0 code path
1 parent 0aeb9c1 commit 449219a

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/rustllvm/RustWrapper.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -606,26 +606,20 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateStaticVariable(
606606
InitExpr = Builder->createConstantValueExpression(
607607
FPVal->getValueAPF().bitcastToAPInt().getZExtValue());
608608
}
609-
#endif
610609

611-
#if LLVM_VERSION_GE(4, 0)
612610
return wrap(Builder->createGlobalVariableExpression(
613-
#else
614-
return wrap(Builder->createGlobalVariable(
615-
#endif
616611
unwrapDI<DIDescriptor>(Context), Name, LinkageName,
617612
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit,
618-
#if LLVM_VERSION_GE(4, 0)
619613
InitExpr,
614+
unwrapDIPtr<MDNode>(Decl),
615+
AlignInBits));
620616
#else
617+
return wrap(Builder->createGlobalVariable(
618+
unwrapDI<DIDescriptor>(Context), Name, LinkageName,
619+
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit,
621620
InitVal,
621+
unwrapDIPtr<MDNode>(Decl)));
622622
#endif
623-
unwrapDIPtr<MDNode>(Decl)
624-
#if LLVM_VERSION_GE(4, 0)
625-
,
626-
AlignInBits
627-
#endif
628-
));
629623
}
630624

631625
extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateVariable(

0 commit comments

Comments
 (0)