diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2024-07-13 00:24:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-13 00:24:35 -0400 |
| commit | cb1ccc184265f0988cf22fc8329b97a3a32ba8f6 (patch) | |
| tree | ccbabb496be92b2f971abea4787d1adddf42f979 /compiler/rustc_codegen_llvm/src | |
| parent | 03c2100dede5d8779a032cf1fc1c28201c37048a (diff) | |
| parent | 8dfd3a455dc7d309f0c82dcb2e2f41da14f6c4af (diff) | |
| download | rust-cb1ccc184265f0988cf22fc8329b97a3a32ba8f6.tar.gz rust-cb1ccc184265f0988cf22fc8329b97a3a32ba8f6.zip | |
Rollup merge of #127654 - nikic:llvm-ndebug-fix, r=cuviper
Fix incorrect NDEBUG handling in LLVM bindings We currently compile our LLVM bindings using `-DNDEBUG` if debuginfo for LLVM is disabled. However, `NDEBUG` doesn't have any relation to debuginfo, it controls whether assertions are enabled. Split the LLVM_NDEBUG environment variable into two, so that assertions and debuginfo are controlled independently. After this change, `LLVMRustDIBuilderInsertDeclareAtEnd` triggers an assertion failure on LLVM 19 due to an incorrect cast. Fix it by removing the unused return value entirely. r? `@cuviper`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 08e9e312827..e0bf6110cdf 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -2057,7 +2057,7 @@ extern "C" { AddrOpsCount: c_uint, DL: &'a DILocation, InsertAtEnd: &'a BasicBlock, - ) -> &'a Value; + ); pub fn LLVMRustDIBuilderCreateEnumerator<'a>( Builder: &DIBuilder<'a>, |