diff options
| author | Tim Neumann <mail@timnn.me> | 2017-03-16 21:01:05 +0100 |
|---|---|---|
| committer | Tim Neumann <mail@timnn.me> | 2017-03-16 21:01:05 +0100 |
| commit | 449219ab2bf65f465b18c0841d7f8d9d3b958943 (patch) | |
| tree | 51ae5b58bde115c549568e233d2672b29ca09ab8 /src/rustllvm/RustWrapper.cpp | |
| parent | 0aeb9c12979e6da753701a798d04105b6b1a8c28 (diff) | |
| download | rust-449219ab2bf65f465b18c0841d7f8d9d3b958943.tar.gz rust-449219ab2bf65f465b18c0841d7f8d9d3b958943.zip | |
isolate llvm 4.0 code path
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index e89f48b4105..714fd2459da 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -606,26 +606,20 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateStaticVariable( InitExpr = Builder->createConstantValueExpression( FPVal->getValueAPF().bitcastToAPInt().getZExtValue()); } -#endif -#if LLVM_VERSION_GE(4, 0) return wrap(Builder->createGlobalVariableExpression( -#else - return wrap(Builder->createGlobalVariable( -#endif unwrapDI<DIDescriptor>(Context), Name, LinkageName, unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit, -#if LLVM_VERSION_GE(4, 0) InitExpr, + unwrapDIPtr<MDNode>(Decl), + AlignInBits)); #else + return wrap(Builder->createGlobalVariable( + unwrapDI<DIDescriptor>(Context), Name, LinkageName, + unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit, InitVal, + unwrapDIPtr<MDNode>(Decl))); #endif - unwrapDIPtr<MDNode>(Decl) -#if LLVM_VERSION_GE(4, 0) - , - AlignInBits -#endif - )); } extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateVariable( |