1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "vm_args.c (rb_warn_check): Use iseq_unique_id instead of its pointer"

Browse Source 
This reverts commit 036bc1da6c6c9b0fa9b7f5968d897a9554dd770e.

This caused a failure on iseq_binary mode.
http://ci.rvm.jp/results/trunk-iseq_binary@silicon-docker/2474587

Numbering iseqs is not trivial due to dump/load.
This commit is contained in:
Yusuke Endoh 2019-12-09 13:49:24 +09:00
parent 39c7230a7a
commit 3cdb37d9db
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iseq.c
View File

@ -427,14 +427,11 @@ rb_iseq_memsize(const rb_iseq_t *iseq)
return size; return size;
} }
static unsigned long fresh_iseq_unique_id = 0; /* -- Remove In 3.0 -- */
static rb_iseq_t * static rb_iseq_t *
iseq_alloc(void) iseq_alloc(void)
{ {
rb_iseq_t *iseq = iseq_imemo_alloc(); rb_iseq_t *iseq = iseq_imemo_alloc();
iseq->body = ZALLOC(struct rb_iseq_constant_body); iseq->body = ZALLOC(struct rb_iseq_constant_body);
iseq->body->iseq_unique_id = fresh_iseq_unique_id++; /* -- Remove In 3.0 -- */
return iseq; return iseq;
} }

6
vm_args.c
View File

@ -593,12 +593,8 @@ VALUE rb_iseq_location(const rb_iseq_t *iseq);
*/ */
static st_table *caller_to_callees = 0; static st_table *caller_to_callees = 0;
static VALUE rb_warn_check(const rb_execution_context_t * const ec, const rb_iseq_t *const iseq) static VALUE rb_warn_check(const rb_execution_context_t * const ec, const void *const callee)
{ {
if (!iseq) return 0;
const void *const callee = (void *)iseq->body->iseq_unique_id;
const rb_control_frame_t * const cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); const rb_control_frame_t * const cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp);
if (!cfp) return 0; if (!cfp) return 0;

2
vm_core.h
View File

@ -447,8 +447,6 @@ struct rb_iseq_constant_body {
long unsigned total_calls; /* number of total calls with `mjit_exec()` */ long unsigned total_calls; /* number of total calls with `mjit_exec()` */
struct rb_mjit_unit *jit_unit; struct rb_mjit_unit *jit_unit;
#endif #endif
unsigned long iseq_unique_id; /* -- Remove In 3.0 -- */
}; };
/* T_IMEMO/iseq */ /* T_IMEMO/iseq */