diff options
| author | bors <bors@rust-lang.org> | 2024-09-21 07:00:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-21 07:00:52 +0000 |
| commit | 74fd001cdae0321144a20133f2216ea8a97da476 (patch) | |
| tree | 8c25cac318c638e5aed9fb64678176a23741bac5 /compiler/rustc_codegen_ssa/src/base.rs | |
| parent | c0838c8ebec23fb87855bb6de3a287981cb1df98 (diff) | |
| parent | 5770ba86860a7594189e69c5d34a730ca46344bd (diff) | |
| download | rust-74fd001cdae0321144a20133f2216ea8a97da476.tar.gz rust-74fd001cdae0321144a20133f2216ea8a97da476.zip | |
Auto merge of #130649 - matthiaskrgr:rollup-57zc7lz, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #129718 (add guarantee about remove_dir and remove_file error kinds) - #130598 (Add recursion limit to FFI safety lint) - #130642 (Pass the current cargo to `run-make` tests) - #130644 (Only expect valtree consts in codegen) - #130645 (Normalize consts in writeback when GCE is enabled) - #130646 (compiler: factor out `OVERFLOWING_LITERALS` impl) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/base.rs')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index f6b45eb4466..3d1007a4673 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -115,9 +115,9 @@ fn unsized_info<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>( let (source, target) = cx.tcx().struct_lockstep_tails_for_codegen(source, target, bx.param_env()); match (source.kind(), target.kind()) { - (&ty::Array(_, len), &ty::Slice(_)) => { - cx.const_usize(len.eval_target_usize(cx.tcx(), ty::ParamEnv::reveal_all())) - } + (&ty::Array(_, len), &ty::Slice(_)) => cx.const_usize( + len.try_to_target_usize(cx.tcx()).expect("expected monomorphic const in codegen"), + ), (&ty::Dynamic(data_a, _, src_dyn_kind), &ty::Dynamic(data_b, _, target_dyn_kind)) if src_dyn_kind == target_dyn_kind => { |