aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--proc.c15
-rw-r--r--vm_method.c6
2 files changed, 7 insertions, 14 deletions
diff --git a/proc.c b/proc.c
index d72e1a9254..1cc36a083c 100644
--- a/proc.c
+++ b/proc.c
@@ -1076,12 +1076,8 @@ iseq_location(const rb_iseq_t *iseq)
if (!iseq) return Qnil;
rb_iseq_check(iseq);
loc[0] = iseq->body->location.path;
- if (iseq->body->line_info_table) {
- loc[1] = rb_iseq_first_lineno(iseq);
- }
- else {
- loc[1] = Qnil;
- }
+ loc[1] = iseq->body->location.first_lineno;
+
return rb_ary_new4(2, loc);
}
@@ -1234,12 +1230,9 @@ proc_to_s_(VALUE self, const rb_proc_t *proc)
case block_type_iseq:
{
const rb_iseq_t *iseq = rb_iseq_check(block->as.captured.code.iseq);
- int first_lineno = 0;
- if (iseq->body->line_info_table) {
- first_lineno = FIX2INT(rb_iseq_first_lineno(iseq));
- }
str = rb_sprintf("#<%s:%p@%"PRIsVALUE":%d%s>", cname, (void *)self,
- iseq->body->location.path, first_lineno, is_lambda);
+ iseq->body->location.path,
+ FIX2INT(iseq->body->location.first_lineno), is_lambda);
}
break;
case block_type_symbol:
diff --git a/vm_method.c b/vm_method.c
index 33e90cf9f1..8aea9b54cc 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -563,9 +563,9 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
default:
break;
}
- if (iseq && !NIL_P(iseq->body->location.path)) {
- int line = iseq->body->line_info_table ? FIX2INT(rb_iseq_first_lineno(iseq)) : 0;
- rb_compile_warning(RSTRING_PTR(iseq->body->location.path), line,
+ if (iseq) {
+ rb_compile_warning(RSTRING_PTR(iseq->body->location.path),
+ FIX2INT(iseq->body->location.first_lineno),
"previous definition of %"PRIsVALUE" was here",
rb_id2str(old_def->original_id));
}