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

compile.c: tailcall before specialize

Browse Source 
* compile.c (iseq_tailcall_optimize): apply tail call optimization
  before conversion to specialized instructions.  when looking
  back from `leave` instruction, `send` instructions have been
  translated already.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-11-19 05:12:14 +00:00
parent 01a54cf40f
commit 3e8672094d
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Nov 19 14:12:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_tailcall_optimize): apply tail call optimization
before conversion to specialized instructions. when looking
back from `leave` instruction, `send` instructions have been
translated already.
Thu Nov 19 13:57:58 2015 NAKAMURA Usaku <usa@ruby-lang.org> Thu Nov 19 13:57:58 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input, * win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input,

32
compile.c
View File

@ -2100,7 +2100,9 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
} }
} }
if (do_tailcallopt && iobj->insn_id == BIN(leave)) { if (do_tailcallopt &&
(iobj->insn_id == BIN(send) ||
iobj->insn_id == BIN(invokesuper))) {
/* /*
* send ... * send ...
* leave * leave
@ -2108,13 +2110,29 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
* send ..., ... | VM_CALL_TAILCALL, ... * send ..., ... | VM_CALL_TAILCALL, ...
* leave # unreachable * leave # unreachable
*/ */
INSN *piobj = (INSN *)get_prev_insn(iobj); INSN *piobj = NULL;
enum ruby_vminsn_type previ = piobj->insn_id; if (iobj->link.next) {
LINK_ELEMENT *next = iobj->link.next;
do {
if (next->type != ISEQ_ELEMENT_INSN) {
next = next->next;
continue;
}
switch (INSN_OF(next)) {
case BIN(nop):
/*case BIN(trace):*/
next = next->next;
break;
case BIN(leave):
piobj = iobj;
default:
next = NULL;
break;
}
} while (next);
}
if (previ == BIN(send) || previ == BIN(opt_send_without_block) || if (piobj) {
previ == BIN(invokesuper) ||
previ == BIN(opt_aref) || previ == BIN(opt_aref_with) ||
previ == BIN(opt_aset) || previ == BIN(opt_aset_with)) {
struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0]; struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0];
rb_iseq_t *blockiseq = (rb_iseq_t *)piobj->operands[1]; rb_iseq_t *blockiseq = (rb_iseq_t *)piobj->operands[1];
if (blockiseq == 0) { if (blockiseq == 0) {