From be84abffbaf315c7534ec4c76edc7b30c3ec8111 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 8 Sep 2024 21:02:30 +0900
Subject: [PATCH] Gather code for builtin loading to miniinit.c

---
 builtin.c      |  2 +-
 mini_builtin.c | 46 +---------------------------------------------
 miniinit.c     | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/builtin.c b/builtin.c
index fbc11bf1b4..3bde2408f8 100644
--- a/builtin.c
+++ b/builtin.c
@@ -7,7 +7,7 @@
 
 #ifndef BUILTIN_BINARY_SIZE
 
-#define INCLUDED_BY_BUILTIN_C 1
+#define BUILTIN_LOADED(feature_name, iseq) ((void)0)
 #include "mini_builtin.c"
 
 #else
diff --git a/mini_builtin.c b/mini_builtin.c
index 2024d5d4a6..e6dfce6e79 100644
--- a/mini_builtin.c
+++ b/mini_builtin.c
@@ -6,11 +6,6 @@
 
 #include "miniprelude.c"
 
-// included from miniinit.c
-
-#ifndef INCLUDED_BY_BUILTIN_C
-static struct st_table *loaded_builtin_table;
-#endif
 
 bool pm_builtin_ast_value(pm_parse_result_t *result, const char *feature_name, VALUE *name_str);
 VALUE rb_builtin_ast_value(const char *feature_name, VALUE *name_str);
@@ -72,10 +67,7 @@ builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *ta
         rb_io_write(rb_stdout, rb_iseq_disasm((const rb_iseq_t *)iseq));
     }
 
-#ifndef INCLUDED_BY_BUILTIN_C
-    st_insert(loaded_builtin_table, (st_data_t)feature_name, (st_data_t)iseq);
-    rb_vm_register_global_object((VALUE)iseq);
-#endif
+    BUILTIN_LOADED(feature_name, iseq);
 
     return iseq;
 }
@@ -86,39 +78,3 @@ rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin
     const rb_iseq_t *iseq = builtin_iseq_load(feature_name, table);
     rb_iseq_eval(iseq);
 }
-
-#ifndef INCLUDED_BY_BUILTIN_C
-
-static int
-each_builtin_i(st_data_t key, st_data_t val, st_data_t dmy)
-{
-    const char *feature = (const char *)key;
-    const rb_iseq_t *iseq = (const rb_iseq_t *)val;
-
-    rb_yield_values(2, rb_str_new2(feature), rb_iseqw_new(iseq));
-
-    return ST_CONTINUE;
-}
-
-/* :nodoc: */
-static VALUE
-each_builtin(VALUE self)
-{
-    st_foreach(loaded_builtin_table, each_builtin_i, 0);
-    return Qnil;
-}
-
-void
-Init_builtin(void)
-{
-    rb_define_singleton_method(rb_cRubyVM, "each_builtin", each_builtin, 0);
-    loaded_builtin_table = st_init_strtable();
-}
-
-void
-Init_builtin_features(void)
-{
-    // register for ruby
-    builtin_iseq_load("gem_prelude", NULL);
-}
-#endif
diff --git a/miniinit.c b/miniinit.c
index 09608c1113..b0adf9da2a 100644
--- a/miniinit.c
+++ b/miniinit.c
@@ -54,8 +54,53 @@ Init_ext(void)
 {
 }
 
+static void builtin_loaded(const char *feature_name, VALUE iseq);
+#define BUILTIN_LOADED(feature_name, iseq) builtin_loaded(feature_name, (VALUE)(iseq))
+
 #include "mini_builtin.c"
 
+static struct st_table *loaded_builtin_table;
+
+static void
+builtin_loaded(const char *feature_name, VALUE iseq)
+{
+    st_insert(loaded_builtin_table, (st_data_t)feature_name, (st_data_t)iseq);
+    rb_vm_register_global_object(iseq);
+}
+
+static int
+each_builtin_i(st_data_t key, st_data_t val, st_data_t dmy)
+{
+    const char *feature = (const char *)key;
+    const rb_iseq_t *iseq = (const rb_iseq_t *)val;
+
+    rb_yield_values(2, rb_str_new2(feature), rb_iseqw_new(iseq));
+
+    return ST_CONTINUE;
+}
+
+/* :nodoc: */
+static VALUE
+each_builtin(VALUE self)
+{
+    st_foreach(loaded_builtin_table, each_builtin_i, 0);
+    return Qnil;
+}
+
+void
+Init_builtin(void)
+{
+    rb_define_singleton_method(rb_cRubyVM, "each_builtin", each_builtin, 0);
+    loaded_builtin_table = st_init_strtable();
+}
+
+void
+Init_builtin_features(void)
+{
+    // register for ruby
+    builtin_iseq_load("gem_prelude", NULL);
+}
+
 void
 rb_free_loaded_builtin_table(void)
 {