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

compile.c: remove more unreachable chunk

Browse Source 
* compile.c (remove_unreachable_chunk): remove beyond labels to be
  removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-05 14:23:22 +00:00
parent 26df9588d6
commit 665839ddda
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
compile.c
View File

@ -2330,25 +2330,48 @@ replace_destination(INSN *dobj, INSN *nobj)
if (!dl->refcnt) ELEM_REMOVE(&dl->link); if (!dl->refcnt) ELEM_REMOVE(&dl->link);
} }
static LABEL*
find_destination(INSN *i)
{
int pos, len = insn_len(i->insn_id);
for (pos = 0; pos < len; ++pos) {
if (insn_op_types(i->insn_id)[pos] == TS_OFFSET) {
return (LABEL *)OPERAND_AT(i, pos);
}
}
return 0;
}
static int static int
remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i) remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
{ {
LINK_ELEMENT *first = i, *end; LINK_ELEMENT *first = i, *end;
int *unref_counts = 0, nlabels = ISEQ_COMPILE_DATA(iseq)->label_no;
if (!i) return 0; if (!i) return 0;
while (i) { unref_counts = ALLOCA_N(int, nlabels);
MEMZERO(unref_counts, int, nlabels);
end = i;
do {
LABEL *lab;
if (IS_INSN(i)) { if (IS_INSN(i)) {
if (IS_INSN_ID(i, jump) || IS_INSN_ID(i, leave)) { if (IS_INSN_ID(i, leave)) {
end = i;
break; break;
} }
else if ((lab = find_destination((INSN *)i)) != 0) {
if (lab->unremovable) break;
unref_counts[lab->label_no]++;
}
} }
else if (IS_LABEL(i)) { else if (IS_LABEL(i)) {
if (((LABEL *)i)->unremovable) return 0; lab = (LABEL *)i;
if (((LABEL *)i)->refcnt > 0) { if (lab->unremovable) return 0;
if (lab->refcnt > unref_counts[lab->label_no]) {
if (i == first) return 0; if (i == first) return 0;
i = i->prev;
break; break;
} }
continue;
} }
else if (IS_TRACE(i)) { else if (IS_TRACE(i)) {
/* do nothing */ /* do nothing */
@ -2357,9 +2380,8 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
LABEL *dest = ((ADJUST *)i)->label; LABEL *dest = ((ADJUST *)i)->label;
if (dest && dest->unremovable) return 0; if (dest && dest->unremovable) return 0;
} }
i = i->next;
}
end = i; end = i;
} while ((i = i->next) != 0);
i = first; i = first;
do { do {
if (IS_INSN(i)) { if (IS_INSN(i)) {