diff options
| author | Hiroshi Mimaki <[email protected]> | 2020-08-06 17:38:20 +0900 |
|---|---|---|
| committer | Hiroshi Mimaki <[email protected]> | 2020-08-06 17:38:20 +0900 |
| commit | 7f8d38bbbe89dadab9d296c76f094c56aabca9f4 (patch) | |
| tree | 10c79fb00ab3378a34abba9b4ce1d01a1b7cefd6 /src/variable.c | |
| parent | 1a9bdfcde5fd7c91e756747ba0565f29385115a7 (diff) | |
| parent | 11cc7bed96551fcceca5cabc1527fd944835a1a0 (diff) | |
| download | mruby-7f8d38bbbe89dadab9d296c76f094c56aabca9f4.tar.gz mruby-7f8d38bbbe89dadab9d296c76f094c56aabca9f4.zip | |
Merge master.
Diffstat (limited to 'src/variable.c')
| -rw-r--r-- | src/variable.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/variable.c b/src/variable.c index 030aa7b00..f05fcee90 100644 --- a/src/variable.c +++ b/src/variable.c @@ -349,7 +349,7 @@ mrb_obj_iv_set_force(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value obj->iv = iv_new(mrb); } iv_put(mrb, obj->iv, sym, v); - mrb_write_barrier(mrb, (struct RBasic*)obj); + mrb_field_write_barrier_value(mrb, (struct RBasic*)obj, v); } MRB_API void @@ -679,7 +679,7 @@ mrb_mod_cv_set(mrb_state *mrb, struct RClass *c, mrb_sym sym, mrb_value v) if (iv_get(mrb, t, sym, NULL)) { mrb_check_frozen(mrb, c); iv_put(mrb, t, sym, v); - mrb_write_barrier(mrb, (struct RBasic*)c); + mrb_field_write_barrier_value(mrb, (struct RBasic*)c, v); return; } c = c->super; @@ -711,7 +711,7 @@ mrb_mod_cv_set(mrb_state *mrb, struct RClass *c, mrb_sym sym, mrb_value v) } iv_put(mrb, c->iv, sym, v); - mrb_write_barrier(mrb, (struct RBasic*)c); + mrb_field_write_barrier_value(mrb, (struct RBasic*)c, v); } MRB_API void @@ -1128,6 +1128,21 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c) return path; } +mrb_int +mrb_obj_iv_tbl_memsize(mrb_state* mrb, mrb_value obj) +{ + size_t nseg = 0; + segment *seg; + + if (mrb_obj_ptr(obj)->iv == NULL) return 0; + seg = mrb_obj_ptr(obj)->iv->rootseg; + while (seg) { + nseg++; + seg = seg->next; + } + return sizeof(iv_tbl) + sizeof(segment)*nseg; +} + #define identchar(c) (ISALNUM(c) || (c) == '_' || !ISASCII(c)) mrb_bool |