diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2021-02-19 07:25:33 +0100 |
|---|---|---|
| committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2021-03-19 23:56:44 +0100 |
| commit | 7b5cc7b6135733cbbce121cc94fdc4a5400f46b5 (patch) | |
| tree | 8423965a37ccfb2581846fac894fd4754ab40e12 | |
| parent | a45f9140a0c237f1b2f82e66595dba6426c5b598 (diff) | |
| download | sparse-7b5cc7b6135733cbbce121cc94fdc4a5400f46b5.tar.gz | |
fix phisources during SWITCH-BR conversion
Like for CBR-BR conversion, when a target BB containing one or several
phi-nodes is removed from an OP_SWITCH, the corresponding phi-source
must be removed from the phi-node.
However this is not done yet.
Changing this by adding some code to convert_to_jump() to remove all
phi-sources from the discarded targets if the converted instruction
is an OP_SWITCH.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
| -rw-r--r-- | flow.c | 20 | ||||
| -rw-r--r-- | validation/optim/bad-phisrc3.c | 1 |
2 files changed, 20 insertions, 1 deletions
@@ -65,6 +65,23 @@ next: ; return changed; } +/// +// remove all phisources but the one corresponding to the given target +static int remove_other_phisources(struct basic_block *bb, struct multijmp_list *list, struct basic_block *target) +{ + struct multijmp *jmp; + int changed = 0; + + FOR_EACH_PTR(list, jmp) { + if (jmp->target == target) { + target = NULL; + continue; + } + changed |= remove_phisources(bb, jmp->target); + } END_FOR_EACH_PTR(jmp); + return changed; +} + /* * Dammit, if we have a phi-node followed by a conditional * branch on that phi-node, we should damn well be able to @@ -764,6 +781,9 @@ int convert_to_jump(struct instruction *insn, struct basic_block *target) case OP_CBR: changed |= remove_phisources(insn->bb, insn->bb_true == target ? insn->bb_false : insn->bb_true); break; + case OP_SWITCH: + changed |= remove_other_phisources(insn->bb, insn->multijmp_list, target); + break; } kill_use(&insn->cond); insn->bb_true = target; diff --git a/validation/optim/bad-phisrc3.c b/validation/optim/bad-phisrc3.c index 6e437771..41537420 100644 --- a/validation/optim/bad-phisrc3.c +++ b/validation/optim/bad-phisrc3.c @@ -13,7 +13,6 @@ void foo(void) /* * check-name: bad-phisrc3 * check-command: test-linearize -Wno-decl $file - * check-known-to-fail * * check-output-ignore * check-output-pattern(2): phisrc\\. |