ruby-changes:53012
From: svn <ko1@a...>
Date: Sat, 20 Oct 2018 19:46:00 +0900 (JST)
Subject: [ruby-changes:53012] svn:r65226 (trunk): * expand tabs.
svn 2018-10-20 19:45:55 +0900 (Sat, 20 Oct 2018) New Revision: 65226 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65226 Log: * expand tabs. Modified files: trunk/compile.c trunk/iseq.c trunk/iseq.h trunk/vm_core.h trunk/vm_insnhelper.c Index: iseq.c =================================================================== --- iseq.c (revision 65225) +++ iseq.c (revision 65226) @@ -214,7 +214,7 @@ rb_iseq_mark(const rb_iseq_t *iseq) https://github.com/ruby/ruby/blob/trunk/iseq.c#L214 } rb_gc_mark(body->variable.coverage); - rb_gc_mark(body->variable.pc2branchindex); + rb_gc_mark(body->variable.pc2branchindex); rb_gc_mark(body->location.label); rb_gc_mark(body->location.base_label); rb_gc_mark(body->location.pathobj); @@ -1925,7 +1925,7 @@ rb_iseq_disasm_insn(VALUE ret, const VAL https://github.com/ruby/ruby/blob/trunk/iseq.c#L1925 { rb_event_flag_t events = rb_iseq_event_flags(iseq, pos); if (events) { - str = rb_str_catf(str, "[%s%s%s%s%s%s%s%s%s%s%s]", + str = rb_str_catf(str, "[%s%s%s%s%s%s%s%s%s%s%s]", events & RUBY_EVENT_LINE ? "Li" : "", events & RUBY_EVENT_CLASS ? "Cl" : "", events & RUBY_EVENT_END ? "En" : "", @@ -1934,9 +1934,9 @@ rb_iseq_disasm_insn(VALUE ret, const VAL https://github.com/ruby/ruby/blob/trunk/iseq.c#L1934 events & RUBY_EVENT_C_CALL ? "Cc" : "", events & RUBY_EVENT_C_RETURN ? "Cr" : "", events & RUBY_EVENT_B_CALL ? "Bc" : "", - events & RUBY_EVENT_B_RETURN ? "Br" : "", - events & RUBY_EVENT_COVERAGE_LINE ? "Cli" : "", - events & RUBY_EVENT_COVERAGE_BRANCH ? "Cbr" : "" + events & RUBY_EVENT_B_RETURN ? "Br" : "", + events & RUBY_EVENT_COVERAGE_LINE ? "Cli" : "", + events & RUBY_EVENT_COVERAGE_BRANCH ? "Cbr" : "" ); } } Index: iseq.h =================================================================== --- iseq.h (revision 65225) +++ iseq.h (revision 65226) @@ -75,8 +75,8 @@ ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t https://github.com/ruby/ruby/blob/trunk/iseq.h#L75 RUBY_EVENT_RETURN| \ RUBY_EVENT_B_CALL| \ RUBY_EVENT_B_RETURN| \ - RUBY_EVENT_COVERAGE_LINE| \ - RUBY_EVENT_COVERAGE_BRANCH) + RUBY_EVENT_COVERAGE_LINE| \ + RUBY_EVENT_COVERAGE_BRANCH) #define ISEQ_NOT_LOADED_YET IMEMO_FL_USER1 #define ISEQ_USE_COMPILE_DATA IMEMO_FL_USER2 Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 65225) +++ vm_insnhelper.c (revision 65226) @@ -3895,12 +3895,12 @@ vm_trace(rb_execution_context_t *ec, rb_ https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L3895 EXEC_EVENT_HOOK(ec, RUBY_EVENT_COVERAGE_LINE, GET_SELF(), 0, 0, 0, Qundef); reg_cfp->pc--; } - if (events & RUBY_EVENT_COVERAGE_BRANCH) { - reg_cfp->pc++; - vm_dtrace(RUBY_EVENT_COVERAGE_BRANCH, ec); - EXEC_EVENT_HOOK(ec, RUBY_EVENT_COVERAGE_BRANCH, GET_SELF(), 0, 0, 0, Qundef); - reg_cfp->pc--; - } + if (events & RUBY_EVENT_COVERAGE_BRANCH) { + reg_cfp->pc++; + vm_dtrace(RUBY_EVENT_COVERAGE_BRANCH, ec); + EXEC_EVENT_HOOK(ec, RUBY_EVENT_COVERAGE_BRANCH, GET_SELF(), 0, 0, 0, Qundef); + reg_cfp->pc--; + } if ((event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) != 0) { VM_ASSERT(event == RUBY_EVENT_END || event == RUBY_EVENT_RETURN || Index: vm_core.h =================================================================== --- vm_core.h (revision 65225) +++ vm_core.h (revision 65226) @@ -449,7 +449,7 @@ struct rb_iseq_constant_body { https://github.com/ruby/ruby/blob/trunk/vm_core.h#L449 struct { rb_snum_t flip_count; VALUE coverage; - VALUE pc2branchindex; + VALUE pc2branchindex; VALUE *original_iseq; } variable; Index: compile.c =================================================================== --- compile.c (revision 65225) +++ compile.c (revision 65226) @@ -2018,7 +2018,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ https://github.com/ruby/ruby/blob/trunk/compile.c#L2018 /* update sp */ sp = calc_sp_depth(sp, iobj); insn_num++; - if (ISEQ_COVERAGE(iseq)) { + if (ISEQ_COVERAGE(iseq)) { if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) && !(rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES)) { int line = iobj->insn_info.line_no; @@ -2031,7 +2031,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ https://github.com/ruby/ruby/blob/trunk/compile.c#L2031 RARRAY_ASET(ISEQ_PC2BRANCHINDEX(iseq), code_index, INT2FIX(data)); } } - code_index += insn_data_length(iobj); + code_index += insn_data_length(iobj); iobj->insn_info.events |= events; events = 0; data = 0; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/