summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-25 16:57:37 -0600
committerGitHub <noreply@github.com>2016-11-25 16:57:37 -0600
commit2217bd771c55aceff8eac61763af9bff11efd30c (patch)
tree4cfbe4e4174aac204ed608f7c14863222f6eaff9 /src/rustllvm/RustWrapper.cpp
parentdad5cdea2a32be1b0277285216e227b3ac56af63 (diff)
parent2e6d49de07bad57f4619f70326bfa5c2e332fb89 (diff)
downloadrust-2217bd771c55aceff8eac61763af9bff11efd30c.tar.gz
rust-2217bd771c55aceff8eac61763af9bff11efd30c.zip
Auto merge of #38000 - rkruppe:llvm-dinamespace-fwdcompat, r=alexcrichton
[LLVM 4.0] Pass new argument ExportSymbol to DIBuilder::createNameSpace

cc #37609
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
-rw-r--r--src/rustllvm/RustWrapper.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 7cde282444d..9f0e38b53ff 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -747,7 +747,11 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateNameSpace(
         unwrapDI<DIDescriptor>(Scope),
         Name,
         unwrapDI<DIFile>(File),
-        LineNo));
+        LineNo
+#if LLVM_VERSION_GE(4, 0)
+        , false // ExportSymbols (only relevant for C++ anonymous namespaces)
+#endif
+    ));
 }
 
 extern "C" void LLVMRustDICompositeTypeSetTypeArray(