diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-09 05:42:06 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-09 05:42:06 +0000 |
commit | 75d5cf55dea0c1351ebd37d432545935698c5c18 (patch) | |
tree | 4b16acf01b6079779eb98fe73eefb586437e0bcf | |
parent | 433a4e66a25c3c05c23565c45b6764d3f367fff4 (diff) | |
download | ruby-75d5cf55dea0c1351ebd37d432545935698c5c18.tar.gz |
RSTRING_PTR is not guaranteed to be VALUE-aligned (retry)
Don't abuse struct RString to hold arbitrary memory region.
Raw pointer should just suffice.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | compile.c | 2 | ||||
-rw-r--r-- | iseq.c | 1 | ||||
-rw-r--r-- | iseq.h | 15 | ||||
-rw-r--r-- | vm_core.h | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -8929,7 +8929,7 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) dump_body.ci_entries = ibf_dump_ci_entries(dump, iseq); dump_body.cc_entries = NULL; dump_body.variable.coverage = Qnil; - dump_body.variable.original_iseq = Qnil; + dump_body.variable.original_iseq = NULL; IBF_W_ALIGN(struct rb_iseq_constant_body); return IBF_WV(dump_body); @@ -222,7 +222,6 @@ rb_iseq_mark(const rb_iseq_t *iseq) } rb_gc_mark(body->variable.coverage); - rb_gc_mark(body->variable.original_iseq); rb_gc_mark(body->location.label); rb_gc_mark(body->location.base_label); rb_gc_mark(body->location.pathobj); @@ -46,23 +46,24 @@ ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq) static inline VALUE * ISEQ_ORIGINAL_ISEQ(const rb_iseq_t *iseq) { - VALUE str = iseq->body->variable.original_iseq; - if (RTEST(str)) return (VALUE *)RSTRING_PTR(str); - return NULL; + return iseq->body->variable.original_iseq; } static inline void ISEQ_ORIGINAL_ISEQ_CLEAR(const rb_iseq_t *iseq) { - RB_OBJ_WRITE(iseq, &iseq->body->variable.original_iseq, Qnil); + void *ptr = iseq->body->variable.original_iseq; + iseq->body->variable.original_iseq = NULL; + if (ptr) { + ruby_xfree(ptr); + } } static inline VALUE * ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t *iseq, long size) { - VALUE str = rb_str_tmp_new(size * sizeof(VALUE)); - RB_OBJ_WRITE(iseq, &iseq->body->variable.original_iseq, str); - return (VALUE *)RSTRING_PTR(str); + return iseq->body->variable.original_iseq = + ruby_xmalloc2(sizeof(VALUE), size); } #define ISEQ_TRACE_EVENTS (RUBY_EVENT_LINE | \ @@ -420,7 +420,7 @@ struct rb_iseq_constant_body { struct { rb_snum_t flip_count; VALUE coverage; - VALUE original_iseq; + VALUE *original_iseq; } variable; unsigned int local_table_size; |