From 8b39a7825d2b96be3d66c4b687fa6d369fecef3c Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 31 May 2023 08:29:12 +0900 Subject: [PATCH] Reduce unnecessary `mrb_obj_ptr()` to `mrb_check_frozen()` --- mrbgems/mruby-metaprog/src/metaprog.c | 2 +- src/variable.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mrbgems/mruby-metaprog/src/metaprog.c b/mrbgems/mruby-metaprog/src/metaprog.c index 7063873c5..6eeaf5391 100644 --- a/mrbgems/mruby-metaprog/src/metaprog.c +++ b/mrbgems/mruby-metaprog/src/metaprog.c @@ -624,7 +624,7 @@ mrb_mod_remove_method(mrb_state *mrb, mrb_value mod) struct RClass *c = mrb_class_ptr(mod); mrb_get_args(mrb, "*", &argv, &argc); - mrb_check_frozen(mrb, mrb_obj_ptr(mod)); + mrb_check_frozen(mrb, c); while (argc--) { mrb_remove_method(mrb, c, mrb_obj_to_sym(mrb, *argv)); mrb_funcall_id(mrb, mod, MRB_SYM(method_removed), 1, *argv); diff --git a/src/variable.c b/src/variable.c index 79b0652d5..be992887a 100644 --- a/src/variable.c +++ b/src/variable.c @@ -504,10 +504,11 @@ MRB_API mrb_value mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym) { if (obj_iv_p(obj)) { - iv_tbl *t = mrb_obj_ptr(obj)->iv; + struct RObject *o = mrb_obj_ptr(obj); + iv_tbl *t = o->iv; mrb_value val; - mrb_check_frozen(mrb, mrb_obj_ptr(obj)); + mrb_check_frozen(mrb, o); if (iv_del(mrb, t, sym, &val)) { return val; }