diff options
| author | bors <bors@rust-lang.org> | 2024-09-27 17:28:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-27 17:28:47 +0000 |
| commit | fa724e5d8cbbdfbd1e53c4c656121af01b694406 (patch) | |
| tree | cb03957ec3e5050d456cb76445a55c146af42ce6 /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | a3f76a26e045a760bb1163b7eab36872985242d5 (diff) | |
| parent | 966a0b76bc21ba65071b4d50dfb0536e0581604f (diff) | |
| download | rust-fa724e5d8cbbdfbd1e53c4c656121af01b694406.tar.gz rust-fa724e5d8cbbdfbd1e53c4c656121af01b694406.zip | |
Auto merge of #130934 - matthiaskrgr:rollup-4puticr, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #129087 (Stabilize `option_get_or_insert_default`) - #130435 (Move Apple linker args from `rustc_target` to `rustc_codegen_ssa`) - #130459 (delete sub build directory "debug" to not delete the change-id file) - #130873 (rustc_target: Add powerpc64 atomic-related features) - #130916 (Use `&raw` in the compiler) - #130917 (Fix error span if arg to `asm!()` is a macro call) - #130927 (update outdated comments) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 71fd7afb148..a2a5499597c 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -478,7 +478,7 @@ pub(crate) fn print(req: &PrintRequest, mut out: &mut String, sess: &Session) { &tm, cpu_cstring.as_ptr(), callback, - std::ptr::addr_of_mut!(out) as *mut c_void, + (&raw mut out) as *mut c_void, ); } } |