diff options
| author | bors <bors@rust-lang.org> | 2023-11-16 03:14:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-16 03:14:51 +0000 |
| commit | 6faa181015208911f9492cc41254fb2a0e95f23f (patch) | |
| tree | 70748a772914d0c7c427c9971a850ea7e6d16617 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 9144d511758fdd85db4daeeea1020f62c61bdd04 (diff) | |
| parent | e2c3e94be9c794d7b9e767a3be34ad863322387b (diff) | |
| download | rust-6faa181015208911f9492cc41254fb2a0e95f23f.tar.gz rust-6faa181015208911f9492cc41254fb2a0e95f23f.zip | |
Auto merge of #117948 - aeubanks:dibuilder, r=durin42
llvm-wrapper: Pass newly added param to DIBuilder::createStaticMemberType() This was added in https://github.com/llvm/llvm-project/pull/72234. DW_TAG_member was the implicit default before. The LLVM change is quite sinister since due to weakly typed ints and default params, this was still successfully compiling against LLVM but was passing the wrong parameters.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index edea09b1634..7ada2eff593 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -983,6 +983,9 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticMemberType( unwrapDI<DIType>(Ty), fromRust(Flags), unwrap<llvm::ConstantInt>(val), +#if LLVM_VERSION_GE(18, 0) + llvm::dwarf::DW_TAG_member, +#endif AlignInBits )); } |