diff options
| author | bors <bors@rust-lang.org> | 2024-06-10 21:21:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-10 21:21:00 +0000 |
| commit | b5b13568fb5da4ac988bde370008d6134d3dfe6c (patch) | |
| tree | 6c5c97a6ce4d3c13ece43e509e62df9f3b0200dc /compiler/rustc_codegen_ssa/src | |
| parent | d402830c8a356332de93761d6996faf5a2ca29ca (diff) | |
| parent | d762ef1d0c16ef70d6282a69b16891f8156782f1 (diff) | |
| download | rust-b5b13568fb5da4ac988bde370008d6134d3dfe6c.tar.gz rust-b5b13568fb5da4ac988bde370008d6134d3dfe6c.zip | |
Auto merge of #126240 - matthiaskrgr:rollup-ks4o2n9, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #126063 (Remove some unused crate dependencies.) - #126115 (Fix ICE due to `unwrap` in `probe_for_name_many`) - #126159 (ScalarInt: size mismatches are a bug, do not delay the panic) - #126184 (interpret: do not ICE on padded non-pow2 SIMD vectors) - #126191 (Fix `NonZero` doctest inconsistencies) - #126211 (migrate tests/run-make/llvm-outputs to use rmake.rs) - #126212 (fix: build on haiku) - #126215 (Add explanatory note to async block type mismatch error) - #126223 (run-make: add `run_in_tmpdir` self-test) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/common.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/common.rs b/compiler/rustc_codegen_ssa/src/common.rs index e4a36b3f591..27b0f127e92 100644 --- a/compiler/rustc_codegen_ssa/src/common.rs +++ b/compiler/rustc_codegen_ssa/src/common.rs @@ -163,7 +163,7 @@ pub fn asm_const_to_str<'tcx>( let mir::ConstValue::Scalar(scalar) = const_value else { span_bug!(sp, "expected Scalar for promoted asm const, but got {:#?}", const_value) }; - let value = scalar.assert_bits(ty_and_layout.size); + let value = scalar.assert_scalar_int().to_bits(ty_and_layout.size); match ty_and_layout.ty.kind() { ty::Uint(_) => value.to_string(), ty::Int(int_ty) => match int_ty.normalize(tcx.sess.target.pointer_width) { |