diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-10-15 08:42:00 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-10-15 08:42:00 +0200 |
| commit | e3bc2fa7e63a75f1a31057aa9c77451f1263488a (patch) | |
| tree | e54ba6d87418a5c238d9d857a44d841e06733cc1 /gcc | |
| parent | cb6064f5059e2261cec180ffd17ac973715a638d (diff) | |
| download | gcc-e3bc2fa7e63a75f1a31057aa9c77451f1263488a.zip gcc-e3bc2fa7e63a75f1a31057aa9c77451f1263488a.tar.gz gcc-e3bc2fa7e63a75f1a31057aa9c77451f1263488a.tar.bz2 | |
Revert unintended commit.
From-SVN: r141128
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/tree-switch-conversion.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index 798cf16..e975745 100644 --- a/gcc/tree-switch-conversion.c +++ b/gcc/tree-switch-conversion.c @@ -296,29 +296,12 @@ check_final_bb (void) { basic_block bb = gimple_phi_arg_edge (phi, i)->src; - if (bb == info.switch_bb - || (single_pred_p (bb) && single_pred (bb) == info.switch_bb)) + if ((bb == info.switch_bb + || (single_pred_p (bb) && single_pred (bb) == info.switch_bb)) + && !is_gimple_ip_invariant (gimple_phi_arg_def (phi, i))) { - tree reloc, val; - - val = gimple_phi_arg_def (phi, i); - if (!is_gimple_ip_invariant (val)) - { - info.reason = " Non-invariant value from a case\n"; - return false; /* Non-invariant argument. */ - } - reloc = initializer_constant_valid_p (val, TREE_TYPE (val)); - if ((flag_pic && reloc != null_pointer_node) - || (!flag_pic && reloc == NULL_TREE)) - { - if (reloc) - info.reason - = " Value from a case would need runtime relocations\n"; - else - info.reason - = " Value from a case is not a valid initializer\n"; - return false; - } + info.reason = " Non-invariant value from a case\n"; + return false; /* Non-invariant argument. */ } } } |