diff options
| -rw-r--r-- | include/mruby/variable.h | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-os-memsize/src/memsize.c | 8 | ||||
| -rw-r--r-- | src/variable.c | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/include/mruby/variable.h b/include/mruby/variable.h index 6d242b000..01a44fff9 100644 --- a/include/mruby/variable.h +++ b/include/mruby/variable.h @@ -35,7 +35,7 @@ mrb_value mrb_vm_cv_get(mrb_state*, mrb_sym); void mrb_vm_cv_set(mrb_state*, mrb_sym, mrb_value); mrb_value mrb_vm_const_get(mrb_state*, mrb_sym); void mrb_vm_const_set(mrb_state*, mrb_sym, mrb_value); -size_t mrb_obj_iv_tbl_memsize(mrb_state*, mrb_value); +size_t mrb_obj_iv_tbl_memsize(mrb_value); MRB_API mrb_value mrb_const_get(mrb_state*, mrb_value, mrb_sym); MRB_API void mrb_const_set(mrb_state*, mrb_value, mrb_sym, mrb_value); MRB_API mrb_bool mrb_const_defined(mrb_state*, mrb_value, mrb_sym); diff --git a/mrbgems/mruby-os-memsize/src/memsize.c b/mrbgems/mruby-os-memsize/src/memsize.c index 359c2683c..4714318bc 100644 --- a/mrbgems/mruby-os-memsize/src/memsize.c +++ b/mrbgems/mruby-os-memsize/src/memsize.c @@ -12,12 +12,6 @@ #include <mruby/range.h> static size_t -os_memsize_of_ivars(mrb_state* mrb, mrb_value obj) -{ - return mrb_obj_iv_tbl_memsize(mrb, obj); -} - -static size_t os_memsize_of_irep(mrb_state* state, const struct mrb_irep *irep) { size_t size; @@ -81,7 +75,7 @@ os_memsize_of_object(mrb_state* mrb, mrb_value obj) case MRB_TT_EXCEPTION: case MRB_TT_OBJECT: { size += mrb_objspace_page_slot_size(); - size += os_memsize_of_ivars(mrb, obj); + size += mrb_obj_iv_tbl_memsize(obj); if (obj_is_kind_of_checked(mrb, obj, "UnboundMethod") || obj_is_kind_of_checked(mrb, obj, "Method")) { size += os_memsize_of_method(mrb, obj); diff --git a/src/variable.c b/src/variable.c index f1375fd4d..9343a2bf5 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1120,7 +1120,7 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c) } size_t -mrb_obj_iv_tbl_memsize(mrb_state* mrb, mrb_value obj) +mrb_obj_iv_tbl_memsize(mrb_value obj) { iv_tbl *t = mrb_obj_ptr(obj)->iv; if (t == NULL) return 0; |
