From 9fc58852e31e576a0df5b7e1df151fb23f0620d8 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 16 May 2025 22:24:16 +0900
Subject: [PATCH] mruby-compiler: removed mrb_state dependency from two
 functions

- mrb_ccontext_partial_hook
- mrb_ccontext_cleanup_local_variables
---
 include/mruby/compile.h                     | 4 ++--
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c    | 2 +-
 mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c    | 2 +-
 mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 2 +-
 mrbgems/mruby-compiler/core/parse.y         | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/mruby/compile.h b/include/mruby/compile.h
index 7367b1de3..40ee8139c 100644
--- a/include/mruby/compile.h
+++ b/include/mruby/compile.h
@@ -41,8 +41,8 @@ typedef struct mrb_ccontext {
 MRB_API mrb_ccontext* mrb_ccontext_new(mrb_state *mrb);
 MRB_API void mrb_ccontext_free(mrb_state *mrb, mrb_ccontext *cxt);
 MRB_API const char *mrb_ccontext_filename(mrb_state *mrb, mrb_ccontext *c, const char *s);
-MRB_API void mrb_ccontext_partial_hook(mrb_state *mrb, mrb_ccontext *c, int (*partial_hook)(struct mrb_parser_state*), void*data);
-MRB_API void mrb_ccontext_cleanup_local_variables(mrb_state *mrb, mrb_ccontext *c);
+MRB_API void mrb_ccontext_partial_hook(mrb_ccontext *c, int (*partial_hook)(struct mrb_parser_state*), void*data);
+MRB_API void mrb_ccontext_cleanup_local_variables(mrb_ccontext *c);
 
 /* compatibility macros */
 #define mrbc_context mrb_ccontext
diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 73aa0d74b..3d25b64f8 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -531,7 +531,7 @@ main(int argc, char **argv)
     mrb_load_file_cxt(mrb, lfp, cxt);
     fclose(lfp);
     mrb_vm_ci_env_clear(mrb, mrb->c->cibase);
-    mrb_ccontext_cleanup_local_variables(mrb, cxt);
+    mrb_ccontext_cleanup_local_variables(cxt);
   }
 
 #ifndef MRB_NO_MIRB_UNDERSCORE
diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
index a7ab67509..2b4b44c8c 100644
--- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
+++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
@@ -245,7 +245,7 @@ load_file(mrb_state *mrb, struct mrbc_args *args)
   args->idx++;
   if (args->idx < args->argc) {
     need_close = FALSE;
-    mrb_ccontext_partial_hook(mrb, c, partial_hook, (void*)args);
+    mrb_ccontext_partial_hook(c, partial_hook, (void*)args);
   }
 
   result = mrb_load_file_cxt(mrb, infile, c);
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index 0f07e4501..253410165 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -339,7 +339,7 @@ main(int argc, char **argv)
       }
       fclose(lfp);
       mrb_vm_ci_env_clear(mrb, mrb->c->cibase);
-      mrb_ccontext_cleanup_local_variables(mrb, c);
+      mrb_ccontext_cleanup_local_variables(c);
     }
 
     /* set program filename */
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index aabc358ec..9522f85c5 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -6767,17 +6767,17 @@ mrb_ccontext_filename(mrb_state *mrb, mrb_ccontext *c, const char *s)
 }
 
 MRB_API void
-mrb_ccontext_partial_hook(mrb_state *mrb, mrb_ccontext *c, int (*func)(struct mrb_parser_state*), void *data)
+mrb_ccontext_partial_hook(mrb_ccontext *c, int (*func)(struct mrb_parser_state*), void *data)
 {
   c->partial_hook = func;
   c->partial_data = data;
 }
 
 MRB_API void
-mrb_ccontext_cleanup_local_variables(mrb_state *mrb, mrb_ccontext *c)
+mrb_ccontext_cleanup_local_variables(mrb_ccontext *c)
 {
   if (c->syms) {
-    mrb_free(mrb, c->syms);
+    mrbc_free(c->syms);
     c->syms = NULL;
     c->slen = 0;
   }