kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

compile.c: do not dump pointers

Browse source 
* compile.c (ibf_dump_iseq_each): do not dump succ_index_table
  pointer.  positions are dumped as integer arrays.  pointer
  values are meaningless outside the process.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-04-05 07:04:39 +00:00
parent 04dfc46ad0
commit bc6e61f149
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compile.c
View file

@ -8612,9 +8612,9 @@ ibf_load_insns_info_body(const struct ibf_load *load, const struct rb_iseq_const
}
static unsigned int *
ibf_dump_insns_info_positions(struct ibf_dump *dump, const rb_iseq_t *iseq)
ibf_dump_insns_info_positions(struct ibf_dump *dump, const struct rb_iseq_constant_body *body)
{
return IBF_W(iseq->body->insns_info.positions, unsigned int, iseq->body->insns_info.size);
return IBF_W(body->insns_info.positions, unsigned int, body->insns_info.size);
}
static unsigned int *
@ -8765,7 +8765,10 @@ static ibf_offset_t
ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
{
struct rb_iseq_constant_body dump_body;
unsigned int *positions;
#if VM_INSN_INFO_TABLE_IMPL == 2
dump_body = *iseq->body;
#endif
dump_body.location.pathobj = ibf_dump_object(dump, dump_body.location.pathobj); /* TODO: freeze */
dump_body.location.base_label = ibf_dump_object(dump, dump_body.location.base_label);
@ -8776,11 +8779,12 @@ ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
dump_body.param.keyword = ibf_dump_param_keyword(dump, iseq);
dump_body.insns_info.body = ibf_dump_insns_info_body(dump, iseq);
#if VM_INSN_INFO_TABLE_IMPL == 2
rb_iseq_insns_info_decode_positions(iseq);
positions = rb_iseq_insns_info_decode_positions(&dump_body);
dump_body.insns_info.positions = positions;
#endif
dump_body.insns_info.positions = ibf_dump_insns_info_positions(dump, iseq);
dump_body.insns_info.positions = ibf_dump_insns_info_positions(dump, &dump_body);
#if VM_INSN_INFO_TABLE_IMPL == 2
rb_iseq_insns_info_encode_positions(iseq);
ruby_xfree(positions);
#endif
dump_body.local_table = ibf_dump_local_table(dump, iseq);
dump_body.catch_table = ibf_dump_catch_table(dump, iseq);

13
iseq.c
View file

@ -498,15 +498,14 @@ rb_iseq_insns_info_encode_positions(const rb_iseq_t *iseq)
#endif
}
void
rb_iseq_insns_info_decode_positions(const rb_iseq_t *iseq)
unsigned int *
rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body)
{
#if VM_INSN_INFO_TABLE_IMPL == 2
int size = iseq->body->insns_info.size;
int max_pos = iseq->body->iseq_size;
struct succ_index_table *sd = iseq->body->insns_info.succ_index_table;
if (iseq->body->insns_info.positions) ruby_xfree(iseq->body->insns_info.positions);
iseq->body->insns_info.positions = succ_index_table_invert(max_pos, sd, size);
int size = body->insns_info.size;
int max_pos = body->iseq_size;
struct succ_index_table *sd = body->insns_info.succ_index_table;
return succ_index_table_invert(max_pos, sd, size);
#endif
}

2
iseq.h
View file

@ -143,6 +143,7 @@ VALUE iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt);
void ibf_load_iseq_complete(rb_iseq_t *iseq);
const rb_iseq_t *iseq_ibf_load(VALUE str);
VALUE iseq_ibf_load_extra_data(VALUE str);
unsigned int *rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body);
RUBY_SYMBOL_EXPORT_BEGIN
@ -164,7 +165,6 @@ void rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events);
void rb_iseq_trace_set_all(rb_event_flag_t turnon_events);
void rb_iseq_trace_on_all(void);
void rb_iseq_insns_info_encode_positions(const rb_iseq_t *iseq);
void rb_iseq_insns_info_decode_positions(const rb_iseq_t *iseq);
VALUE rb_iseqw_new(const rb_iseq_t *iseq);
const rb_iseq_t *rb_iseqw_to_iseq(VALUE iseqw);