From c112e83b5d5b2cf3f53d9a58981d62b70c655435 Mon Sep 17 00:00:00 2001
From: dearblue <dearblue@users.osdn.me>
Date: Sun, 21 Jan 2024 13:14:41 +0900
Subject: [PATCH] Removed `mrb_jmpbuf_id` for C++ exceptions

Use stack variable addresses as identifiers instead of global variable values.
Since the stack variable address is uniquely determined within the call, there is no need to maintain a global variable.
---
 include/mruby/throw.h | 14 +++-----------
 src/vm.c              |  4 ----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/include/mruby/throw.h b/include/mruby/throw.h
index 547eea12c..f2984de69 100644
--- a/include/mruby/throw.h
+++ b/include/mruby/throw.h
@@ -16,11 +16,11 @@
 # if defined(__cplusplus)
 
 #define MRB_TRY(buf) try {
-#define MRB_CATCH(buf) } catch(mrb_jmpbuf_impl e) { if (e != (buf)->impl) { throw e; }
+#define MRB_CATCH(buf) } catch(mrb_jmpbuf *e) { if (e != (buf)) { throw e; }
 #define MRB_END_EXC(buf)  }
 
-#define MRB_THROW(buf) throw((buf)->impl)
-typedef mrb_int mrb_jmpbuf_impl;
+#define MRB_THROW(buf) throw(buf)
+typedef void *mrb_jmpbuf_impl;
 
 # else
 # error "need to be compiled with C++ compiler"
@@ -50,16 +50,8 @@ typedef mrb_int mrb_jmpbuf_impl;
 
 #endif
 
-#if defined(MRB_USE_CXX_EXCEPTION)
-extern mrb_int mrb_jmpbuf_id;
-#endif
-
 struct mrb_jmpbuf {
   mrb_jmpbuf_impl impl;
-
-#if defined(MRB_USE_CXX_EXCEPTION)
-  mrb_jmpbuf() : impl(mrb_jmpbuf_id++) {}
-#endif
 };
 
 #endif  /* MRB_THROW_H */
diff --git a/src/vm.c b/src/vm.c
index a5c1dee9c..13844560b 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -3120,7 +3120,3 @@ mrb_top_run(mrb_state *mrb, const struct RProc *proc, mrb_value self, mrb_int st
   }
   return mrb_vm_run(mrb, proc, self, stack_keep);
 }
-
-#if defined(MRB_USE_CXX_EXCEPTION) && defined(__cplusplus)
-mrb_int mrb_jmpbuf_id = 0;
-#endif