diff options
| author | bors <bors@rust-lang.org> | 2025-04-07 06:27:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-07 06:27:35 +0000 |
| commit | 8fb32ab8e563124fe0968a2878b7f5b5d0e8d722 (patch) | |
| tree | b0e05f49cf42e7faf4bc9f9dffb40518e23c690b /compiler/rustc_codegen_llvm/src/back/write.rs | |
| parent | b9856b6e400709392dd14599265b6fd52fc19f3e (diff) | |
| parent | 58ad76313fa088ff0ffd91949ac89c49cc60dc37 (diff) | |
| download | rust-8fb32ab8e563124fe0968a2878b7f5b5d0e8d722.tar.gz rust-8fb32ab8e563124fe0968a2878b7f5b5d0e8d722.zip | |
Auto merge of #139473 - Kobzol:rollup-ycksn9b, r=Kobzol
Rollup of 5 pull requests Successful merges: - #138314 (fix usage of `autodiff` macro with inner functions) - #139426 (Make the UnifyKey and UnifyValue imports non-nightly) - #139431 (Remove LLVM 18 inline ASM span fallback) - #139456 (style guide: add let-chain rules) - #139467 (More trivial tweaks) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back/write.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index bf6138142b6..76d431a4975 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -439,12 +439,9 @@ fn report_inline_asm( let span = if cookie == 0 || matches!(cgcx.lto, Lto::Fat | Lto::Thin) { SpanData::default() } else { - let lo = BytePos::from_u32(cookie as u32); - let hi = BytePos::from_u32((cookie >> 32) as u32); SpanData { - lo, - // LLVM version < 19 silently truncates the cookie to 32 bits in some situations. - hi: if hi.to_u32() != 0 { hi } else { lo }, + lo: BytePos::from_u32(cookie as u32), + hi: BytePos::from_u32((cookie >> 32) as u32), ctxt: SyntaxContext::root(), parent: None, } |