1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/eval_context.rs b/compiler/rustc_const_eval/src/interpret/eval_context.rs
index 23ade4b0106..6d3e5ea1031 100644
--- a/compiler/rustc_const_eval/src/interpret/eval_context.rs
+++ b/compiler/rustc_const_eval/src/interpret/eval_context.rs
@@ -899,10 +899,12 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
         let return_to_block = frame.return_to_block;
         let return_place = frame.return_place.clone();
 
-        let return_action = if cleanup {
-            M::after_stack_pop(self, frame, unwinding)?
+        let return_action;
+        if cleanup {
+            return_action = M::after_stack_pop(self, frame, unwinding)?;
+            assert_ne!(return_action, ReturnAction::NoCleanup);
         } else {
-            ReturnAction::NoCleanup
+            return_action = ReturnAction::NoCleanup;
         };
 
         Ok(StackPopInfo { return_action, return_to_block, return_place })