diff options
author | Yusuke Endoh <[email protected]> | 2021-06-18 01:31:50 +0900 |
---|---|---|
committer | Yusuke Endoh <[email protected]> | 2021-06-18 02:34:27 +0900 |
commit | fb01411ae842dbcc16d18dec2216fa2719649dff (patch) | |
tree | e8dcf2550a7aa8c5579a86b2623b00b96d6f8f8c /iseq.c | |
parent | acae5f363dfaedd9c2873cee68c9498da3c072f5 (diff) |
node.h: Reduce struct size to fit with Ruby object size (five VALUEs)
by merging `rb_ast_body_t#line_count` and `#script_lines`.
Fortunately `line_count == RARRAY_LEN(script_lines)` was always
satisfied. When script_lines is saved, it has an array of lines, and
when not saved, it has a Fixnum that represents the old line_count.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4581
Diffstat (limited to 'iseq.c')
-rw-r--r-- | iseq.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -813,13 +813,23 @@ rb_iseq_new(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, 0, type, &COMPILE_OPTION_DEFAULT); } +static int +ast_line_count(const rb_ast_body_t *ast) +{ + if (RB_TYPE_P(ast->script_lines, T_ARRAY)){ + return (int)RARRAY_LEN(ast->script_lines); + } + return FIX2INT(ast->script_lines); +} + rb_iseq_t * rb_iseq_new_top(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent) { VALUE coverages = rb_get_coverages(); if (RTEST(coverages)) { - if (ast->line_count >= 0) { - int len = (rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES) ? 0 : ast->line_count; + int line_count = ast_line_count(ast); + if (line_count >= 0) { + int len = (rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES) ? 0 : line_count; VALUE coverage = rb_default_coverage(len); rb_hash_aset(coverages, path, coverage); } |