diff options
author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-20 05:26:07 +0000 |
---|---|---|
committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-20 05:26:07 +0000 |
commit | c54ede0560be7e57b90b063fcddab402f4f29cd3 (patch) | |
tree | 3a08922be9709cbf10d21276d12839fdafef5cd4 | |
parent | 9ec0e8cb35c06a87b098dbbfe5f9a979ddd646e9 (diff) | |
download | ruby-c54ede0560be7e57b90b063fcddab402f4f29cd3.tar.gz |
proc.c: assume rb_iseq_location_t::first_lineno is always a Fixnum
Do not check for the value of rb_iseq_constant_body::line_info_table as
it is no longer related. The checks seem to be the remains from the day
before the dedicated 'first_lineno' field was introduced. Remove them.
Note, rb_iseq_constant_body::line_info_table can be NULL only when the
iseq does not contain any instructions that originate from Ruby code,
for example, an iseq created with 'proc {}' under a non-default compile
options where trace instructions are disabled.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | proc.c | 15 | ||||
-rw-r--r-- | thread.c | 10 | ||||
-rw-r--r-- | vm_method.c | 6 |
3 files changed, 9 insertions, 22 deletions
@@ -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: @@ -788,19 +788,13 @@ thread_initialize(VALUE thread, VALUE args) } GetThreadPtr(thread, th); if (th->first_args) { - VALUE proc = th->first_proc, line, loc; - VALUE file; + VALUE proc = th->first_proc, loc; if (!proc || !RTEST(loc = rb_proc_location(proc))) { rb_raise(rb_eThreadError, "already initialized thread"); } - file = RARRAY_AREF(loc, 0); - if (NIL_P(line = RARRAY_AREF(loc, 1))) { - rb_raise(rb_eThreadError, - "already initialized thread - %"PRIsVALUE, file); - } rb_raise(rb_eThreadError, "already initialized thread - %"PRIsVALUE":%"PRIsVALUE, - file, line); + RARRAY_AREF(loc, 0), RARRAY_AREF(loc, 1)); } return thread_create_core(thread, args, 0); } 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)); } |