diff options
| author | bors <bors@rust-lang.org> | 2018-11-26 12:14:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-26 12:14:13 +0000 |
| commit | 6bfb46e4ac9a2704f06de1a2ff7a4612cd70c8cb (patch) | |
| tree | b41fb59406c53b5d9a249b41541946285a3f7ef1 /src/rustllvm/RustWrapper.cpp | |
| parent | b51632e3f0856ea444f5e59819538e85947673fc (diff) | |
| parent | 7215963e56321c5e92b9c2f7c4ad788362451b37 (diff) | |
| download | rust-6bfb46e4ac9a2704f06de1a2ff7a4612cd70c8cb.tar.gz rust-6bfb46e4ac9a2704f06de1a2ff7a4612cd70c8cb.zip | |
Auto merge of #55835 - alexcrichton:llvm-upgrade, r=nikomatsakis
Upgrade LLVM to trunk, still version 8 This commit upgrades the LLVM/LLD/compiler-rt submodules used to the current trunk versions in upstream. Some activity has happened on the wasm SIMD side of things as well as LLD which we'd like to pick up!
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index f423503e19f..b6e07942f86 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -708,7 +708,11 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable( llvm::DIGlobalVariableExpression *VarExpr = Builder->createGlobalVariableExpression( unwrapDI<DIDescriptor>(Context), Name, LinkageName, unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit, - InitExpr, unwrapDIPtr<MDNode>(Decl), AlignInBits); + InitExpr, unwrapDIPtr<MDNode>(Decl), +#if LLVM_VERSION_GE(8, 0) + /* templateParams */ nullptr, +#endif + AlignInBits); InitVal->setMetadata("dbg", VarExpr); |