bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

changes from review

Browse source
This commit is contained in:
Kyle Matsuda 2023-02-14 14:17:38 -07:00
parent c183110cc2
commit 8e92849cbb
11 changed files with 53 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_const_eval/src/interpret/memory.rs
View file

@ -690,7 +690,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
assert!(self.tcx.is_static(def_id));
assert!(!self.tcx.is_thread_local_static(def_id));
// Use size and align of the type.
let ty = self.tcx.type_of(def_id).subst_identity();
let ty = self
.tcx
.type_of(def_id)
.no_bound_vars()
.expect("statics should not have generic parameters");
let layout = self.tcx.layout_of(ParamEnv::empty().and(ty)).unwrap();
assert!(layout.is_sized());
(layout.size, layout.align.abi, AllocKind::LiveData)