From e3bc2fa7e63a75f1a31057aa9c77451f1263488a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 15 Oct 2008 08:42:00 +0200 Subject: [PATCH] Revert unintended commit. From-SVN: r141128 --- gcc/tree-switch-conversion.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index 798cf161569..e9757454f21 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. */ } } }