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_llvm | |
| 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_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 6c84a40defb..57e396415cc 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -125,7 +125,9 @@ fn build_fixed_size_array_di_node<'ll, 'tcx>( let (size, align) = cx.size_and_align_of(array_type); - let upper_bound = len.eval_target_usize(cx.tcx, ty::ParamEnv::reveal_all()) as c_longlong; + let upper_bound = len + .try_to_target_usize(cx.tcx) + .expect("expected monomorphic const in codegen") as c_longlong; let subrange = unsafe { Some(llvm::LLVMRustDIBuilderGetOrCreateSubrange(DIB(cx), 0, upper_bound)) }; |