mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that eval_to_allocation_raw isn't called on static items from miri

Browse Source
This commit is contained in:
Oli Scherer 2023-10-17 08:50:41 +00:00
parent fec0b54978
commit 066ec1273a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_const_eval/src/interpret/eval_context.rs
View File

@ -1074,17 +1074,14 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
instance: ty::Instance<'tcx>, instance: ty::Instance<'tcx>,
) -> InterpResult<'tcx, MPlaceTy<'tcx, M::Provenance>> { ) -> InterpResult<'tcx, MPlaceTy<'tcx, M::Provenance>> {
let gid = GlobalId { instance, promoted: None }; let gid = GlobalId { instance, promoted: None };
// For statics we pick `ParamEnv::reveal_all`, because statics don't have generics let val = if self.tcx.is_static(gid.instance.def_id()) {
// and thus don't care about the parameter environment. While we could just use let alloc_id = self.tcx.reserve_and_set_static_alloc(gid.instance.def_id());
// `self.param_env`, that would mean we invoke the query to evaluate the static
// with different parameter environments, thus causing the static to be evaluated let ty = instance.ty(self.tcx.tcx, self.param_env);
// multiple times. mir::ConstAlloc { alloc_id, ty }
let param_env = if self.tcx.is_static(gid.instance.def_id()) {
ty::ParamEnv::reveal_all()
} else { } else {
self.param_env self.ctfe_query(|tcx| tcx.eval_to_allocation_raw(self.param_env.and(gid)))?
}; };
let val = self.ctfe_query(|tcx| tcx.eval_to_allocation_raw(param_env.and(gid)))?;
self.raw_const_to_mplace(val) self.raw_const_to_mplace(val)
} }