From 5791aa6263f730e3b2c8d4a4fb7a054539cf6135 Mon Sep 17 00:00:00 2001
From: Matt Valentine-House <matt@eightbitraptor.com>
Date: Tue, 7 Mar 2023 18:13:46 +0000
Subject: [PATCH] Move RB_GC_SAVE_MACHINE_CONTEXT to vm_core.h

---
 internal/gc.h | 7 -------
 vm_core.h     | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/gc.h b/internal/gc.h
index 73b6e6fed0..0abdb22ffd 100644
--- a/internal/gc.h
+++ b/internal/gc.h
@@ -33,13 +33,6 @@ NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
 #define USE_CONSERVATIVE_STACK_END
 #endif
 
-#define RB_GC_SAVE_MACHINE_CONTEXT(th)				\
-    do {							\
-        FLUSH_REGISTER_WINDOWS;					\
-        setjmp((th)->ec->machine.regs);				\
-        SET_MACHINE_STACK_END(&(th)->ec->machine.stack_end);	\
-    } while (0)
-
 /* for GC debug */
 
 #ifndef RUBY_MARK_FREE_DEBUG
diff --git a/vm_core.h b/vm_core.h
index 724c8cd739..e44a3936af 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -1819,6 +1819,13 @@ RUBY_EXTERN unsigned int    ruby_vm_event_local_num;
 #define GET_THREAD() rb_current_thread()
 #define GET_EC()     rb_current_execution_context(true)
 
+#define RB_GC_SAVE_MACHINE_CONTEXT(th)				\
+    do {							\
+        FLUSH_REGISTER_WINDOWS;					\
+        setjmp((th)->ec->machine.regs);				\
+        SET_MACHINE_STACK_END(&(th)->ec->machine.stack_end);	\
+    } while (0)
+
 static inline rb_thread_t *
 rb_ec_thread_ptr(const rb_execution_context_t *ec)
 {