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

Remove LOCATION_TYPE_ISEQ_CALCED state from Backtrace::Location

Browse Source 
Previously Backtrace::Location had two possible states:
LOCATION_TYPE_ISEQ and LOCATION_TYPE_ISEQ_CALCED. The former had the
location information as PC, and the latter had it as lineno.
Once lineno was caluculated, the state was changed to
LOCATION_TYPE_ISEQ_CALCED and the caluculated result was kept.

This change removes LOCATION_TYPE_ISEQ_CALCED, so lineno is calculated
whenever it is needed. It will be slow a little, but lineno is typically
needed only when its backtrace is shown, so I believe that it does not
matter.

This is a preparation to add column information to Backtrace::Location
because PC is needed to caluculate node_id for AST::Node even after
lineno is calculated. This change is approved by ko1.
This commit is contained in:
Yusuke Endoh 2021-06-08 13:22:27 +09:00
parent ed3e30fc09
commit ea6062898a
Notes: git 2021-06-18 03:36:00 +09:00 
Merged: https://github.com/ruby/ruby/pull/4558
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vm_backtrace.c
View File

@ -41,11 +41,12 @@ calc_lineno(const rb_iseq_t *iseq, const VALUE *pc)
VM_ASSERT(iseq->body->iseq_encoded); VM_ASSERT(iseq->body->iseq_encoded);
VM_ASSERT(iseq->body->iseq_size); VM_ASSERT(iseq->body->iseq_size);
if (! pc) { if (! pc) {
/* This can happen during VM bootup. */ if (iseq->body->type == ISEQ_TYPE_TOP) {
VM_ASSERT(iseq->body->type == ISEQ_TYPE_TOP); VM_ASSERT(! iseq->body->local_table);
VM_ASSERT(! iseq->body->local_table); VM_ASSERT(! iseq->body->local_table_size);
VM_ASSERT(! iseq->body->local_table_size); return 0;
return 0; }
return FIX2INT(iseq->body->location.first_lineno);
} }
else { else {
ptrdiff_t n = pc - iseq->body->iseq_encoded; ptrdiff_t n = pc - iseq->body->iseq_encoded;
@ -89,17 +90,13 @@ rb_vm_get_sourceline(const rb_control_frame_t *cfp)
typedef struct rb_backtrace_location_struct { typedef struct rb_backtrace_location_struct {
enum LOCATION_TYPE { enum LOCATION_TYPE {
LOCATION_TYPE_ISEQ = 1, LOCATION_TYPE_ISEQ = 1,
LOCATION_TYPE_ISEQ_CALCED,
LOCATION_TYPE_CFUNC, LOCATION_TYPE_CFUNC,
} type; } type;
union { union {
struct { struct {
const rb_iseq_t *iseq; const rb_iseq_t *iseq;
union { const VALUE *pc;
const VALUE *pc;
int lineno;
} lineno;
} iseq; } iseq;
struct { struct {
ID mid; ID mid;
@ -125,7 +122,6 @@ location_mark_entry(rb_backtrace_location_t *fi)
{ {
switch (fi->type) { switch (fi->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
case LOCATION_TYPE_ISEQ_CALCED:
rb_gc_mark_movable((VALUE)fi->body.iseq.iseq); rb_gc_mark_movable((VALUE)fi->body.iseq.iseq);
break; break;
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
@ -160,10 +156,7 @@ location_lineno(rb_backtrace_location_t *loc)
{ {
switch (loc->type) { switch (loc->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
loc->type = LOCATION_TYPE_ISEQ_CALCED; return calc_lineno(loc->body.iseq.iseq, loc->body.iseq.pc);
return (loc->body.iseq.lineno.lineno = calc_lineno(loc->body.iseq.iseq, loc->body.iseq.lineno.pc));
case LOCATION_TYPE_ISEQ_CALCED:
return loc->body.iseq.lineno.lineno;
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
if (loc->body.cfunc.prev_loc) { if (loc->body.cfunc.prev_loc) {
return location_lineno(loc->body.cfunc.prev_loc); return location_lineno(loc->body.cfunc.prev_loc);
@ -194,7 +187,6 @@ location_label(rb_backtrace_location_t *loc)
{ {
switch (loc->type) { switch (loc->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
case LOCATION_TYPE_ISEQ_CALCED:
return loc->body.iseq.iseq->body->location.label; return loc->body.iseq.iseq->body->location.label;
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
return rb_id2str(loc->body.cfunc.mid); return rb_id2str(loc->body.cfunc.mid);
@ -242,7 +234,6 @@ location_base_label(rb_backtrace_location_t *loc)
{ {
switch (loc->type) { switch (loc->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
case LOCATION_TYPE_ISEQ_CALCED:
return loc->body.iseq.iseq->body->location.base_label; return loc->body.iseq.iseq->body->location.base_label;
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
return rb_id2str(loc->body.cfunc.mid); return rb_id2str(loc->body.cfunc.mid);
@ -268,7 +259,6 @@ location_path(rb_backtrace_location_t *loc)
{ {
switch (loc->type) { switch (loc->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
case LOCATION_TYPE_ISEQ_CALCED:
return rb_iseq_path(loc->body.iseq.iseq); return rb_iseq_path(loc->body.iseq.iseq);
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
if (loc->body.cfunc.prev_loc) { if (loc->body.cfunc.prev_loc) {
@ -302,7 +292,6 @@ location_realpath(rb_backtrace_location_t *loc)
{ {
switch (loc->type) { switch (loc->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
case LOCATION_TYPE_ISEQ_CALCED:
return rb_iseq_realpath(loc->body.iseq.iseq); return rb_iseq_realpath(loc->body.iseq.iseq);
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
if (loc->body.cfunc.prev_loc) { if (loc->body.cfunc.prev_loc) {
@ -355,13 +344,7 @@ location_to_str(rb_backtrace_location_t *loc)
file = rb_iseq_path(loc->body.iseq.iseq); file = rb_iseq_path(loc->body.iseq.iseq);
name = loc->body.iseq.iseq->body->location.label; name = loc->body.iseq.iseq->body->location.label;
lineno = loc->body.iseq.lineno.lineno = calc_lineno(loc->body.iseq.iseq, loc->body.iseq.lineno.pc); lineno = calc_lineno(loc->body.iseq.iseq, loc->body.iseq.pc);
loc->type = LOCATION_TYPE_ISEQ_CALCED;
break;
case LOCATION_TYPE_ISEQ_CALCED:
file = rb_iseq_path(loc->body.iseq.iseq);
lineno = loc->body.iseq.lineno.lineno;
name = loc->body.iseq.iseq->body->location.label;
break; break;
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
if (loc->body.cfunc.prev_loc) { if (loc->body.cfunc.prev_loc) {
@ -433,7 +416,6 @@ location_update_entry(rb_backtrace_location_t *fi)
{ {
switch (fi->type) { switch (fi->type) {
case LOCATION_TYPE_ISEQ: case LOCATION_TYPE_ISEQ:
case LOCATION_TYPE_ISEQ_CALCED:
fi->body.iseq.iseq = (rb_iseq_t*)rb_gc_location((VALUE)fi->body.iseq.iseq); fi->body.iseq.iseq = (rb_iseq_t*)rb_gc_location((VALUE)fi->body.iseq.iseq);
break; break;
case LOCATION_TYPE_CFUNC: case LOCATION_TYPE_CFUNC:
@ -684,7 +666,7 @@ bt_iter_iseq(void *ptr, const rb_control_frame_t *cfp)
rb_backtrace_location_t *loc = &arg->bt->backtrace[arg->bt->backtrace_size++-1]; rb_backtrace_location_t *loc = &arg->bt->backtrace[arg->bt->backtrace_size++-1];
loc->type = LOCATION_TYPE_ISEQ; loc->type = LOCATION_TYPE_ISEQ;
loc->body.iseq.iseq = iseq; loc->body.iseq.iseq = iseq;
loc->body.iseq.lineno.pc = pc; loc->body.iseq.pc = pc;
arg->prev_loc = loc; arg->prev_loc = loc;
} }
@ -697,13 +679,13 @@ bt_iter_iseq_skip_internal(void *ptr, const rb_control_frame_t *cfp)
if (!is_internal_location(cfp)) { if (!is_internal_location(cfp)) {
loc->type = LOCATION_TYPE_ISEQ; loc->type = LOCATION_TYPE_ISEQ;
loc->body.iseq.iseq = cfp->iseq; loc->body.iseq.iseq = cfp->iseq;
loc->body.iseq.lineno.pc = cfp->pc; loc->body.iseq.pc = cfp->pc;
arg->prev_loc = loc; arg->prev_loc = loc;
} }
else if (arg->prev_cfp) { else if (arg->prev_cfp) {
loc->type = LOCATION_TYPE_ISEQ; loc->type = LOCATION_TYPE_ISEQ;
loc->body.iseq.iseq = arg->prev_cfp->iseq; loc->body.iseq.iseq = arg->prev_cfp->iseq;
loc->body.iseq.lineno.pc = arg->prev_cfp->pc; loc->body.iseq.pc = arg->prev_cfp->pc;
arg->prev_loc = loc; arg->prev_loc = loc;
} }
else { else {
@ -726,7 +708,7 @@ bt_iter_cfunc(void *ptr, const rb_control_frame_t *cfp, ID mid)
const VALUE *pc = arg->prev_cfp->pc; const VALUE *pc = arg->prev_cfp->pc;
arg->init_loc->type = LOCATION_TYPE_ISEQ; arg->init_loc->type = LOCATION_TYPE_ISEQ;
arg->init_loc->body.iseq.iseq = iseq; arg->init_loc->body.iseq.iseq = iseq;
arg->init_loc->body.iseq.lineno.pc = pc; arg->init_loc->body.iseq.pc = pc;
loc->body.cfunc.prev_loc = arg->prev_loc = arg->init_loc; loc->body.cfunc.prev_loc = arg->prev_loc = arg->init_loc;
} }
else { else {
@ -828,19 +810,16 @@ MJIT_FUNC_EXPORTED void
rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self) rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self)
{ {
const rb_backtrace_t *bt; const rb_backtrace_t *bt;
const rb_iseq_t *iseq;
rb_backtrace_location_t *loc; rb_backtrace_location_t *loc;
GetCoreDataFromValue(self, rb_backtrace_t, bt); GetCoreDataFromValue(self, rb_backtrace_t, bt);
VM_ASSERT(bt->backtrace_size > 1); VM_ASSERT(bt->backtrace_size > 1);
loc = &bt->backtrace[bt->backtrace_size - 2]; loc = &bt->backtrace[bt->backtrace_size - 2];
iseq = loc->body.iseq.iseq;
VM_ASSERT(loc->type == LOCATION_TYPE_ISEQ); VM_ASSERT(loc->type == LOCATION_TYPE_ISEQ);
loc->body.iseq.lineno.lineno = FIX2INT(iseq->body->location.first_lineno); loc->body.iseq.pc = NULL; // means location.first_lineno
loc->type = LOCATION_TYPE_ISEQ_CALCED;
} }
static VALUE static VALUE