diff options
| author | bors <bors@rust-lang.org> | 2023-11-16 21:29:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-16 21:29:49 +0000 |
| commit | ee48a3f24121d42ba32b69856d6d6e22ae01d8c7 (patch) | |
| tree | 384c503a882266654d78521607ead1296aa50706 /compiler/rustc_llvm/llvm-wrapper | |
| parent | 3d65927fae3bf2c90ced4955a2ec6a24bb04d865 (diff) | |
| parent | a5a039be35f7cfb8230819d214da04f97d71f735 (diff) | |
| download | rust-ee48a3f24121d42ba32b69856d6d6e22ae01d8c7.tar.gz rust-ee48a3f24121d42ba32b69856d6d6e22ae01d8c7.zip | |
Auto merge of #3171 - saethlin:rustup, r=saethlin
Rustup For https://github.com/rust-lang/miri/pull/3103
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 4390486b0de..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 )); } @@ -1105,7 +1108,11 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType( unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen), unwrapDI<DIFile>(File), LineNumber, SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)), - unwrapDI<DIType>(ClassTy), "", IsScoped)); + unwrapDI<DIType>(ClassTy), +#if LLVM_VERSION_GE(18, 0) + /* RunTimeLang */ 0, +#endif + "", IsScoped)); } extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateUnionType( |