diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-04-07 08:23:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-07 08:23:35 +0200 |
| commit | 501235451c378917d24a9b6fb1558d3363f16312 (patch) | |
| tree | b88c7dc0e37859ff2528db4f83cbfeb75b32cc4d /compiler/rustc_codegen_llvm/src | |
| parent | f4177f4bdecfdbeeb7f5c1bd07014d9c0f59757c (diff) | |
| parent | 3aac9a37a5ff306eccb63872a7d6f4ef6f90a577 (diff) | |
| download | rust-501235451c378917d24a9b6fb1558d3363f16312.tar.gz rust-501235451c378917d24a9b6fb1558d3363f16312.zip | |
Rollup merge of #139431 - beetrees:no-llvm-18, r=jieyouxu
Remove LLVM 18 inline ASM span fallback The minimum supported LLVM version is now 19, so this fallback is no longer required.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -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, } |