diff options
| author | Deadbeef <ent3rm4n@gmail.com> | 2021-12-12 12:34:46 +0800 |
|---|---|---|
| committer | Deadbeef <ent3rm4n@gmail.com> | 2021-12-12 12:34:46 +0800 |
| commit | 84b1d859c8caa6049bfe728b219f679286151bb2 (patch) | |
| tree | 472c311c437160a1bc2dd88d43d134e735e4a94b /compiler/rustc_const_eval/src/interpret | |
| parent | c5f8788d8d3c158173450e21fe17c4034819816d (diff) | |
| download | rust-84b1d859c8caa6049bfe728b219f679286151bb2.tar.gz rust-84b1d859c8caa6049bfe728b219f679286151bb2.zip | |
Revert "Auto merge of #91491 - spastorino:revert-91354, r=oli-obk"
This reverts commit ff2439b7b9bafcfdff86b7847128014699df8442, reversing changes made to 2a9e0831d6603d87220cedd1b1293e2eb82ef55c.
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/eval_context.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/eval_context.rs b/compiler/rustc_const_eval/src/interpret/eval_context.rs index d46950ed903..39637d6c254 100644 --- a/compiler/rustc_const_eval/src/interpret/eval_context.rs +++ b/compiler/rustc_const_eval/src/interpret/eval_context.rs @@ -929,6 +929,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { } else { self.param_env }; + let param_env = param_env.with_const(); let val = self.tcx.eval_to_allocation_raw(param_env.and(gid))?; self.raw_const_to_mplace(val) } |