From 84b1d859c8caa6049bfe728b219f679286151bb2 Mon Sep 17 00:00:00 2001 From: Deadbeef Date: Sun, 12 Dec 2021 12:34:46 +0800 Subject: Revert "Auto merge of #91491 - spastorino:revert-91354, r=oli-obk" This reverts commit ff2439b7b9bafcfdff86b7847128014699df8442, reversing changes made to 2a9e0831d6603d87220cedd1b1293e2eb82ef55c. --- compiler/rustc_const_eval/src/interpret/eval_context.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'compiler/rustc_const_eval/src/interpret') 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) } -- cgit 1.4.1-3-g733a5