From 00aba961857b42c695eb4118a3a3586dbe9ca084 Mon Sep 17 00:00:00 2001
From: Skgland <bennet.blessmann+github@googlemail.com>
Date: Mon, 8 Dec 2025 22:27:24 +0100
Subject: [PATCH] remove overengineered RecursionGuard

---
 src/machine/machine_errors.rs | 45 ++++++-----------------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/src/machine/machine_errors.rs b/src/machine/machine_errors.rs
index ead28cd9..420ab6fe 100644
--- a/src/machine/machine_errors.rs
+++ b/src/machine/machine_errors.rs
@@ -778,47 +778,16 @@ impl MachineState {
 
     // throw an error pre-allocated in the heap
     pub(super) fn throw_resource_error(&mut self, err: AllocError) {
-        struct RecursionGuard<'state> {
-            machine_state: &'state mut MachineState,
+        if self.throwing_resource_error {
+            panic!("attempted to throw `error(resource_error(memory), [])` while attempting to throw `error(resource_error(memory), [])`");
         }
+        self.throwing_resource_error = true;
 
-        impl<'state> RecursionGuard<'state> {
-            fn new(machine_state: &'state mut MachineState) -> Self {
-                if machine_state.throwing_resource_error {
-                    panic!("attempted to throw `error(resource_error(memory), [])` while attempting to throw `error(resource_error(memory), [])`");
-                }
-                machine_state.throwing_resource_error = true;
-                Self { machine_state }
-            }
-        }
-
-        impl Drop for RecursionGuard<'_> {
-            fn drop(&mut self) {
-                self.machine_state.throwing_resource_error = false;
-            }
-        }
-
-        impl std::ops::Deref for RecursionGuard<'_> {
-            type Target = MachineState;
-
-            fn deref(&self) -> &MachineState {
-                self.machine_state
-            }
-        }
-
-        impl std::ops::DerefMut for RecursionGuard<'_> {
-            fn deref_mut(&mut self) -> &mut MachineState {
-                self.machine_state
-            }
-        }
-
-        let mut guard = RecursionGuard::new(self);
-
-        let state = &mut *guard;
+        self.registers[1] = str_loc_as_cell!(err.resource_error_offset(&mut self.heap));
+        self.set_ball();
+        self.unwind_stack();
 
-        state.registers[1] = str_loc_as_cell!(err.resource_error_offset(&mut state.heap));
-        state.set_ball();
-        state.unwind_stack();
+        self.throwing_resource_error = false;
     }
 
     pub(super) fn throw_exception(&mut self, err: MachineStub) {
-- 
2.54.0