X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-complex.c;h=f1ef1770939a6f1cd0510b4888b2070024f084f7;hb=d87daa15fec34f326bfd7abf1462fffd82b8fdc2;hp=a3470b1b7b6977c0d562db35406353b113203978;hpb=52966e98d94230ab4d201df34c473141e80f1cca;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c index a3470b1b7b6..f1ef1770939 100644 --- a/gcc/tree-complex.c +++ b/gcc/tree-complex.c @@ -1,49 +1,52 @@ /* Lower complex number operations to scalar operations. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. - + GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any +Free Software Foundation; either version 3, or (at your option) any later version. - + GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" -#include "real.h" #include "flags.h" #include "tree-flow.h" -#include "tree-gimple.h" +#include "gimple.h" #include "tree-iterator.h" #include "tree-pass.h" #include "tree-ssa-propagate.h" +#include "diagnostic.h" /* For each complex ssa name, a lattice value. We're interested in finding out whether a complex number is degenerate in some way, having only real or only complex parts. */ -typedef enum +enum { UNINITIALIZED = 0, ONLY_REAL = 1, ONLY_IMAG = 2, VARYING = 3 -} complex_lattice_t; +}; + +/* The type complex_lattice_t holds combinations of the above + constants. */ +typedef int complex_lattice_t; #define PAIR(a, b) ((a) << 2 | (b)) @@ -52,9 +55,39 @@ DEF_VEC_ALLOC_I(complex_lattice_t, heap); static VEC(complex_lattice_t, heap) *complex_lattice_values; -/* For each complex variable, a pair of variables for the components. */ -static VEC(tree, heap) *complex_variable_components; +/* For each complex variable, a pair of variables for the components exists in + the hashtable. */ +static htab_t complex_variable_components; +/* For each complex SSA_NAME, a pair of ssa names for the components. */ +static VEC(tree, heap) *complex_ssa_name_components; + +/* Lookup UID in the complex_variable_components hashtable and return the + associated tree. */ +static tree +cvc_lookup (unsigned int uid) +{ + struct int_tree_map *h, in; + in.uid = uid; + h = (struct int_tree_map *) htab_find_with_hash (complex_variable_components, &in, uid); + return h ? h->to : NULL; +} + +/* Insert the pair UID, TO into the complex_variable_components hashtable. */ + +static void +cvc_insert (unsigned int uid, tree to) +{ + struct int_tree_map *h; + void **loc; + + h = XNEW (struct int_tree_map); + h->uid = uid; + h->to = to; + loc = htab_find_slot_with_hash (complex_variable_components, h, + uid, INSERT); + *(struct int_tree_map **) loc = h; +} /* Return true if T is not a zero constant. In the case of real values, we're only interested in +0.0. */ @@ -64,24 +97,50 @@ some_nonzerop (tree t) { int zerop = false; - if (TREE_CODE (t) == REAL_CST) + /* Operations with real or imaginary part of a complex number zero + cannot be treated the same as operations with a real or imaginary + operand if we care about the signs of zeros in the result. */ + if (TREE_CODE (t) == REAL_CST && !flag_signed_zeros) zerop = REAL_VALUES_IDENTICAL (TREE_REAL_CST (t), dconst0); + else if (TREE_CODE (t) == FIXED_CST) + zerop = fixed_zerop (t); else if (TREE_CODE (t) == INTEGER_CST) zerop = integer_zerop (t); return !zerop; } -/* Compute a lattice value from T. It may be a gimple_val, or, as a - special exception, a COMPLEX_EXPR. */ + +/* Compute a lattice value from the components of a complex type REAL + and IMAG. */ static complex_lattice_t -find_lattice_value (tree t) +find_lattice_value_parts (tree real, tree imag) { - tree real, imag; int r, i; complex_lattice_t ret; + r = some_nonzerop (real); + i = some_nonzerop (imag); + ret = r * ONLY_REAL + i * ONLY_IMAG; + + /* ??? On occasion we could do better than mapping 0+0i to real, but we + certainly don't want to leave it UNINITIALIZED, which eventually gets + mapped to VARYING. */ + if (ret == UNINITIALIZED) + ret = ONLY_REAL; + + return ret; +} + + +/* Compute a lattice value from gimple_val T. */ + +static complex_lattice_t +find_lattice_value (tree t) +{ + tree real, imag; + switch (TREE_CODE (t)) { case SSA_NAME: @@ -93,26 +152,11 @@ find_lattice_value (tree t) imag = TREE_IMAGPART (t); break; - case COMPLEX_EXPR: - real = TREE_OPERAND (t, 0); - imag = TREE_OPERAND (t, 1); - break; - default: gcc_unreachable (); } - r = some_nonzerop (real); - i = some_nonzerop (imag); - ret = r*ONLY_REAL + i*ONLY_IMAG; - - /* ??? On occasion we could do better than mapping 0+0i to real, but we - certainly don't want to leave it UNINITIALIZED, which eventually gets - mapped to VARYING. */ - if (ret == UNINITIALIZED) - ret = ONLY_REAL; - - return ret; + return find_lattice_value_parts (real, imag); } /* Determine if LHS is something for which we're interested in seeing @@ -129,69 +173,82 @@ is_complex_reg (tree lhs) static void init_parameter_lattice_values (void) { - tree parm; + tree parm, ssa_name; for (parm = DECL_ARGUMENTS (cfun->decl); parm ; parm = TREE_CHAIN (parm)) - if (is_complex_reg (parm) && var_ann (parm) != NULL) - { - tree ssa_name = default_def (parm); - VEC_replace (complex_lattice_t, complex_lattice_values, - SSA_NAME_VERSION (ssa_name), VARYING); - } + if (is_complex_reg (parm) + && var_ann (parm) != NULL + && (ssa_name = gimple_default_def (cfun, parm)) != NULL_TREE) + VEC_replace (complex_lattice_t, complex_lattice_values, + SSA_NAME_VERSION (ssa_name), VARYING); } -/* Initialize DONT_SIMULATE_AGAIN for each stmt and phi. Return false if - we found no statements we want to simulate, and thus there's nothing for - the entire pass to do. */ +/* Initialize simulation state for each statement. Return false if we + found no statements we want to simulate, and thus there's nothing + for the entire pass to do. */ static bool init_dont_simulate_again (void) { basic_block bb; - block_stmt_iterator bsi; - tree phi; + gimple_stmt_iterator gsi; + gimple phi; bool saw_a_complex_op = false; FOR_EACH_BB (bb) { - for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi)) - DONT_SIMULATE_AGAIN (phi) = !is_complex_reg (PHI_RESULT (phi)); + for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + { + phi = gsi_stmt (gsi); + prop_set_simulate_again (phi, + is_complex_reg (gimple_phi_result (phi))); + } - for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi)) + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) { - tree orig_stmt, stmt, rhs = NULL; - bool dsa = true; + gimple stmt; + tree op0, op1; + bool sim_again_p; + + stmt = gsi_stmt (gsi); + op0 = op1 = NULL_TREE; - orig_stmt = stmt = bsi_stmt (bsi); - switch (TREE_CODE (stmt)) + /* Most control-altering statements must be initially + simulated, else we won't cover the entire cfg. */ + sim_again_p = stmt_ends_bb_p (stmt); + + switch (gimple_code (stmt)) { - case RETURN_EXPR: - stmt = TREE_OPERAND (stmt, 0); - if (!stmt || TREE_CODE (stmt) != MODIFY_EXPR) - break; - /* FALLTHRU */ + case GIMPLE_CALL: + if (gimple_call_lhs (stmt)) + sim_again_p = is_complex_reg (gimple_call_lhs (stmt)); + break; - case MODIFY_EXPR: - dsa = !is_complex_reg (TREE_OPERAND (stmt, 0)); - rhs = TREE_OPERAND (stmt, 1); + case GIMPLE_ASSIGN: + sim_again_p = is_complex_reg (gimple_assign_lhs (stmt)); + if (gimple_assign_rhs_code (stmt) == REALPART_EXPR + || gimple_assign_rhs_code (stmt) == IMAGPART_EXPR) + op0 = TREE_OPERAND (gimple_assign_rhs1 (stmt), 0); + else + op0 = gimple_assign_rhs1 (stmt); + if (gimple_num_ops (stmt) > 2) + op1 = gimple_assign_rhs2 (stmt); break; - case COND_EXPR: - rhs = TREE_OPERAND (stmt, 0); + case GIMPLE_COND: + op0 = gimple_cond_lhs (stmt); + op1 = gimple_cond_rhs (stmt); break; default: break; } - if (rhs) - switch (TREE_CODE (rhs)) + if (op0 || op1) + switch (gimple_expr_code (stmt)) { case EQ_EXPR: case NE_EXPR: - rhs = TREE_OPERAND (rhs, 0); - /* FALLTHRU */ - case PLUS_EXPR: case MINUS_EXPR: case MULT_EXPR: @@ -200,9 +257,25 @@ init_dont_simulate_again (void) case FLOOR_DIV_EXPR: case ROUND_DIV_EXPR: case RDIV_EXPR: + if (TREE_CODE (TREE_TYPE (op0)) == COMPLEX_TYPE + || TREE_CODE (TREE_TYPE (op1)) == COMPLEX_TYPE) + saw_a_complex_op = true; + break; + case NEGATE_EXPR: case CONJ_EXPR: - if (TREE_CODE (TREE_TYPE (rhs)) == COMPLEX_TYPE) + if (TREE_CODE (TREE_TYPE (op0)) == COMPLEX_TYPE) + saw_a_complex_op = true; + break; + + case REALPART_EXPR: + case IMAGPART_EXPR: + /* The total store transformation performed during + gimplification creates such uninitialized loads + and we need to lower the statement to be able + to fix things up. */ + if (TREE_CODE (op0) == SSA_NAME + && ssa_undefined_value_p (op0)) saw_a_complex_op = true; break; @@ -210,7 +283,7 @@ init_dont_simulate_again (void) break; } - DONT_SIMULATE_AGAIN (orig_stmt) = dsa; + prop_set_simulate_again (stmt, sim_again_p); } } @@ -221,22 +294,20 @@ init_dont_simulate_again (void) /* Evaluate statement STMT against the complex lattice defined above. */ static enum ssa_prop_result -complex_visit_stmt (tree stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, +complex_visit_stmt (gimple stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, tree *result_p) { complex_lattice_t new_l, old_l, op1_l, op2_l; unsigned int ver; - tree lhs, rhs; + tree lhs; + + lhs = gimple_get_lhs (stmt); + /* Skip anything but GIMPLE_ASSIGN and GIMPLE_CALL with a lhs. */ + if (!lhs) + return SSA_PROP_VARYING; /* These conditions should be satisfied due to the initial filter set up in init_dont_simulate_again. */ - if (TREE_CODE (stmt) == RETURN_EXPR) - stmt = TREE_OPERAND (stmt, 0); - gcc_assert (TREE_CODE (stmt) == MODIFY_EXPR); - - lhs = TREE_OPERAND (stmt, 0); - rhs = TREE_OPERAND (stmt, 1); - gcc_assert (TREE_CODE (lhs) == SSA_NAME); gcc_assert (TREE_CODE (TREE_TYPE (lhs)) == COMPLEX_TYPE); @@ -244,18 +315,22 @@ complex_visit_stmt (tree stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, ver = SSA_NAME_VERSION (lhs); old_l = VEC_index (complex_lattice_t, complex_lattice_values, ver); - switch (TREE_CODE (rhs)) + switch (gimple_expr_code (stmt)) { case SSA_NAME: - case COMPLEX_EXPR: case COMPLEX_CST: - new_l = find_lattice_value (rhs); + new_l = find_lattice_value (gimple_assign_rhs1 (stmt)); + break; + + case COMPLEX_EXPR: + new_l = find_lattice_value_parts (gimple_assign_rhs1 (stmt), + gimple_assign_rhs2 (stmt)); break; case PLUS_EXPR: case MINUS_EXPR: - op1_l = find_lattice_value (TREE_OPERAND (rhs, 0)); - op2_l = find_lattice_value (TREE_OPERAND (rhs, 1)); + op1_l = find_lattice_value (gimple_assign_rhs1 (stmt)); + op2_l = find_lattice_value (gimple_assign_rhs2 (stmt)); /* We've set up the lattice values such that IOR neatly models addition. */ @@ -268,8 +343,8 @@ complex_visit_stmt (tree stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, case CEIL_DIV_EXPR: case FLOOR_DIV_EXPR: case ROUND_DIV_EXPR: - op1_l = find_lattice_value (TREE_OPERAND (rhs, 0)); - op2_l = find_lattice_value (TREE_OPERAND (rhs, 1)); + op1_l = find_lattice_value (gimple_assign_rhs1 (stmt)); + op2_l = find_lattice_value (gimple_assign_rhs2 (stmt)); /* Obviously, if either varies, so does the result. */ if (op1_l == VARYING || op2_l == VARYING) @@ -295,7 +370,7 @@ complex_visit_stmt (tree stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, case NEGATE_EXPR: case CONJ_EXPR: - new_l = find_lattice_value (TREE_OPERAND (rhs, 0)); + new_l = find_lattice_value (gimple_assign_rhs1 (stmt)); break; default: @@ -314,14 +389,14 @@ complex_visit_stmt (tree stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, /* Evaluate a PHI node against the complex lattice defined above. */ static enum ssa_prop_result -complex_visit_phi (tree phi) +complex_visit_phi (gimple phi) { complex_lattice_t new_l, old_l; unsigned int ver; tree lhs; int i; - lhs = PHI_RESULT (phi); + lhs = gimple_phi_result (phi); /* This condition should be satisfied due to the initial filter set up in init_dont_simulate_again. */ @@ -329,8 +404,8 @@ complex_visit_phi (tree phi) /* We've set up the lattice values such that IOR neatly models PHI meet. */ new_l = UNINITIALIZED; - for (i = PHI_NUM_ARGS (phi) - 1; i >= 0; --i) - new_l |= find_lattice_value (PHI_ARG_DEF (phi, i)); + for (i = gimple_phi_num_args (phi) - 1; i >= 0; --i) + new_l |= find_lattice_value (gimple_phi_arg_def (phi, i)); ver = SSA_NAME_VERSION (lhs); old_l = VEC_index (complex_lattice_t, complex_lattice_values, ver); @@ -342,77 +417,173 @@ complex_visit_phi (tree phi) return new_l == VARYING ? SSA_PROP_VARYING : SSA_PROP_INTERESTING; } -/* For each referenced complex gimple register, set up a pair of registers - to hold the components of the complex value. */ +/* Create one backing variable for a complex component of ORIG. */ -static void -create_components (void) +static tree +create_one_component_var (tree type, tree orig, const char *prefix, + const char *suffix, enum tree_code code) { - size_t k, n; + tree r = create_tmp_var (type, prefix); + add_referenced_var (r); - n = num_referenced_vars; - if (n == 0) - return; + DECL_SOURCE_LOCATION (r) = DECL_SOURCE_LOCATION (orig); + DECL_ARTIFICIAL (r) = 1; + + if (DECL_NAME (orig) && !DECL_IGNORED_P (orig)) + { + const char *name = IDENTIFIER_POINTER (DECL_NAME (orig)); - complex_variable_components = VEC_alloc (tree, heap, 2*n); - VEC_safe_grow (tree, heap, complex_variable_components, 2*n); + DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, NULL))); - for (k = 0; k < n; ++k) + SET_DECL_DEBUG_EXPR (r, build1 (code, type, orig)); + DECL_DEBUG_EXPR_IS_FROM (r) = 1; + DECL_IGNORED_P (r) = 0; + TREE_NO_WARNING (r) = TREE_NO_WARNING (orig); + } + else { - tree var = referenced_var (k); - tree r = NULL, i = NULL; + DECL_IGNORED_P (r) = 1; + TREE_NO_WARNING (r) = 1; + } - if (var != NULL - && TREE_CODE (TREE_TYPE (var)) == COMPLEX_TYPE - && is_gimple_reg (var)) - { - tree inner_type = TREE_TYPE (TREE_TYPE (var)); + return r; +} - r = make_rename_temp (inner_type, "CR"); - i = make_rename_temp (inner_type, "CI"); - DECL_SOURCE_LOCATION (r) = DECL_SOURCE_LOCATION (var); - DECL_SOURCE_LOCATION (i) = DECL_SOURCE_LOCATION (var); - DECL_ARTIFICIAL (r) = 1; - DECL_ARTIFICIAL (i) = 1; +/* Retrieve a value for a complex component of VAR. */ - if (DECL_NAME (var) && !DECL_IGNORED_P (var)) - { - const char *name = IDENTIFIER_POINTER (DECL_NAME (var)); +static tree +get_component_var (tree var, bool imag_p) +{ + size_t decl_index = DECL_UID (var) * 2 + imag_p; + tree ret = cvc_lookup (decl_index); - DECL_NAME (r) = get_identifier (ACONCAT ((name, "$real", NULL))); - DECL_NAME (i) = get_identifier (ACONCAT ((name, "$imag", NULL))); + if (ret == NULL) + { + ret = create_one_component_var (TREE_TYPE (TREE_TYPE (var)), var, + imag_p ? "CI" : "CR", + imag_p ? "$imag" : "$real", + imag_p ? IMAGPART_EXPR : REALPART_EXPR); + cvc_insert (decl_index, ret); + } - SET_DECL_DEBUG_EXPR (r, build1 (REALPART_EXPR, inner_type, var)); - SET_DECL_DEBUG_EXPR (i, build1 (IMAGPART_EXPR, inner_type, var)); - DECL_DEBUG_EXPR_IS_FROM (r) = 1; - DECL_DEBUG_EXPR_IS_FROM (i) = 1; + return ret; +} - DECL_IGNORED_P (r) = 0; - DECL_IGNORED_P (i) = 0; +/* Retrieve a value for a complex component of SSA_NAME. */ - TREE_NO_WARNING (r) = TREE_NO_WARNING (var); - TREE_NO_WARNING (i) = TREE_NO_WARNING (var); - } - else - { - DECL_IGNORED_P (r) = 1; - DECL_IGNORED_P (i) = 1; - TREE_NO_WARNING (r) = 1; - TREE_NO_WARNING (i) = 1; - } +static tree +get_component_ssa_name (tree ssa_name, bool imag_p) +{ + complex_lattice_t lattice = find_lattice_value (ssa_name); + size_t ssa_name_index; + tree ret; + + if (lattice == (imag_p ? ONLY_REAL : ONLY_IMAG)) + { + tree inner_type = TREE_TYPE (TREE_TYPE (ssa_name)); + if (SCALAR_FLOAT_TYPE_P (inner_type)) + return build_real (inner_type, dconst0); + else + return build_int_cst (inner_type, 0); + } + + ssa_name_index = SSA_NAME_VERSION (ssa_name) * 2 + imag_p; + ret = VEC_index (tree, complex_ssa_name_components, ssa_name_index); + if (ret == NULL) + { + ret = get_component_var (SSA_NAME_VAR (ssa_name), imag_p); + ret = make_ssa_name (ret, NULL); + + /* Copy some properties from the original. In particular, whether it + is used in an abnormal phi, and whether it's uninitialized. */ + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ret) + = SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name); + if (TREE_CODE (SSA_NAME_VAR (ssa_name)) == VAR_DECL + && gimple_nop_p (SSA_NAME_DEF_STMT (ssa_name))) + { + SSA_NAME_DEF_STMT (ret) = SSA_NAME_DEF_STMT (ssa_name); + set_default_def (SSA_NAME_VAR (ret), ret); } - VEC_replace (tree, complex_variable_components, 2*k, r); - VEC_replace (tree, complex_variable_components, 2*k + 1, i); + VEC_replace (tree, complex_ssa_name_components, ssa_name_index, ret); } + + return ret; +} + +/* Set a value for a complex component of SSA_NAME, return a + gimple_seq of stuff that needs doing. */ + +static gimple_seq +set_component_ssa_name (tree ssa_name, bool imag_p, tree value) +{ + complex_lattice_t lattice = find_lattice_value (ssa_name); + size_t ssa_name_index; + tree comp; + gimple last; + gimple_seq list; + + /* We know the value must be zero, else there's a bug in our lattice + analysis. But the value may well be a variable known to contain + zero. We should be safe ignoring it. */ + if (lattice == (imag_p ? ONLY_REAL : ONLY_IMAG)) + return NULL; + + /* If we've already assigned an SSA_NAME to this component, then this + means that our walk of the basic blocks found a use before the set. + This is fine. Now we should create an initialization for the value + we created earlier. */ + ssa_name_index = SSA_NAME_VERSION (ssa_name) * 2 + imag_p; + comp = VEC_index (tree, complex_ssa_name_components, ssa_name_index); + if (comp) + ; + + /* If we've nothing assigned, and the value we're given is already stable, + then install that as the value for this SSA_NAME. This preemptively + copy-propagates the value, which avoids unnecessary memory allocation. */ + else if (is_gimple_min_invariant (value) + && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name)) + { + VEC_replace (tree, complex_ssa_name_components, ssa_name_index, value); + return NULL; + } + else if (TREE_CODE (value) == SSA_NAME + && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name)) + { + /* Replace an anonymous base value with the variable from cvc_lookup. + This should result in better debug info. */ + if (DECL_IGNORED_P (SSA_NAME_VAR (value)) + && !DECL_IGNORED_P (SSA_NAME_VAR (ssa_name))) + { + comp = get_component_var (SSA_NAME_VAR (ssa_name), imag_p); + replace_ssa_name_symbol (value, comp); + } + + VEC_replace (tree, complex_ssa_name_components, ssa_name_index, value); + return NULL; + } + + /* Finally, we need to stabilize the result by installing the value into + a new ssa name. */ + else + comp = get_component_ssa_name (ssa_name, imag_p); + + /* Do all the work to assign VALUE to COMP. */ + list = NULL; + value = force_gimple_operand (value, &list, false, NULL); + last = gimple_build_assign (comp, value); + gimple_seq_add_stmt (&list, last); + gcc_assert (SSA_NAME_DEF_STMT (comp) == last); + + return list; } /* Extract the real or imaginary part of a complex variable or constant. Make sure that it's a proper gimple_val and gimplify it if not. - Emit any new code before BSI. */ + Emit any new code before gsi. */ static tree -extract_component (block_stmt_iterator *bsi, tree t, bool imagpart_p, +extract_component (gimple_stmt_iterator *gsi, tree t, bool imagpart_p, bool gimple_p) { switch (TREE_CODE (t)) @@ -421,13 +592,15 @@ extract_component (block_stmt_iterator *bsi, tree t, bool imagpart_p, return imagpart_p ? TREE_IMAGPART (t) : TREE_REALPART (t); case COMPLEX_EXPR: - return TREE_OPERAND (t, imagpart_p); + gcc_unreachable (); case VAR_DECL: + case RESULT_DECL: case PARM_DECL: case INDIRECT_REF: case COMPONENT_REF: case ARRAY_REF: + case VIEW_CONVERT_EXPR: { tree inner_type = TREE_TYPE (TREE_TYPE (t)); @@ -435,31 +608,14 @@ extract_component (block_stmt_iterator *bsi, tree t, bool imagpart_p, inner_type, unshare_expr (t)); if (gimple_p) - t = gimplify_val (bsi, inner_type, t); + t = force_gimple_operand_gsi (gsi, t, true, NULL, true, + GSI_SAME_STMT); return t; } case SSA_NAME: - { - tree def = SSA_NAME_DEF_STMT (t); - - if (TREE_CODE (def) == MODIFY_EXPR) - { - def = TREE_OPERAND (def, 1); - if (TREE_CODE (def) == COMPLEX_CST) - return imagpart_p ? TREE_IMAGPART (def) : TREE_REALPART (def); - if (TREE_CODE (def) == COMPLEX_EXPR) - { - def = TREE_OPERAND (def, imagpart_p); - if (TREE_CONSTANT (def)) - return def; - } - } - - return VEC_index (tree, complex_variable_components, - var_ann (SSA_NAME_VAR (t))->uid * 2 + imagpart_p); - } + return get_component_ssa_name (t, imagpart_p); default: gcc_unreachable (); @@ -469,68 +625,53 @@ extract_component (block_stmt_iterator *bsi, tree t, bool imagpart_p, /* Update the complex components of the ssa name on the lhs of STMT. */ static void -update_complex_components (block_stmt_iterator *bsi, tree stmt, tree r, tree i) +update_complex_components (gimple_stmt_iterator *gsi, gimple stmt, tree r, + tree i) { - unsigned int uid = var_ann (SSA_NAME_VAR (TREE_OPERAND (stmt, 0)))->uid; - tree v, x; - - v = VEC_index (tree, complex_variable_components, 2*uid); - x = build2 (MODIFY_EXPR, TREE_TYPE (v), v, r); - SET_EXPR_LOCUS (x, EXPR_LOCUS (stmt)); - TREE_BLOCK (x) = TREE_BLOCK (stmt); - bsi_insert_after (bsi, x, BSI_NEW_STMT); - - v = VEC_index (tree, complex_variable_components, 2*uid + 1); - x = build2 (MODIFY_EXPR, TREE_TYPE (v), v, i); - SET_EXPR_LOCUS (x, EXPR_LOCUS (stmt)); - TREE_BLOCK (x) = TREE_BLOCK (stmt); - bsi_insert_after (bsi, x, BSI_NEW_STMT); + tree lhs; + gimple_seq list; + + lhs = gimple_get_lhs (stmt); + + list = set_component_ssa_name (lhs, false, r); + if (list) + gsi_insert_seq_after (gsi, list, GSI_CONTINUE_LINKING); + + list = set_component_ssa_name (lhs, true, i); + if (list) + gsi_insert_seq_after (gsi, list, GSI_CONTINUE_LINKING); } static void -update_complex_components_on_edge (edge e, tree stmt, tree lhs, tree r, tree i) +update_complex_components_on_edge (edge e, tree lhs, tree r, tree i) { - unsigned int uid = var_ann (SSA_NAME_VAR (lhs))->uid; - tree v, x; + gimple_seq list; - v = VEC_index (tree, complex_variable_components, 2*uid); - x = build2 (MODIFY_EXPR, TREE_TYPE (v), v, r); - if (stmt) - { - SET_EXPR_LOCUS (x, EXPR_LOCUS (stmt)); - TREE_BLOCK (x) = TREE_BLOCK (stmt); - } - bsi_insert_on_edge (e, x); + list = set_component_ssa_name (lhs, false, r); + if (list) + gsi_insert_seq_on_edge (e, list); - v = VEC_index (tree, complex_variable_components, 2*uid + 1); - x = build2 (MODIFY_EXPR, TREE_TYPE (v), v, i); - if (stmt) - { - SET_EXPR_LOCUS (x, EXPR_LOCUS (stmt)); - TREE_BLOCK (x) = TREE_BLOCK (stmt); - } - bsi_insert_on_edge (e, x); + list = set_component_ssa_name (lhs, true, i); + if (list) + gsi_insert_seq_on_edge (e, list); } + /* Update an assignment to a complex variable in place. */ static void -update_complex_assignment (block_stmt_iterator *bsi, tree r, tree i) +update_complex_assignment (gimple_stmt_iterator *gsi, tree r, tree i) { - tree stmt, mod; - tree type; - - mod = stmt = bsi_stmt (*bsi); - if (TREE_CODE (stmt) == RETURN_EXPR) - mod = TREE_OPERAND (mod, 0); - else if (in_ssa_p) - update_complex_components (bsi, stmt, r, i); - - type = TREE_TYPE (TREE_OPERAND (mod, 1)); - TREE_OPERAND (mod, 1) = build (COMPLEX_EXPR, type, r, i); - update_stmt (stmt); + gimple_stmt_iterator orig_si = *gsi; + + if (gimple_in_ssa_p (cfun)) + update_complex_components (gsi, gsi_stmt (*gsi), r, i); + + gimple_assign_set_rhs_with_ops (&orig_si, COMPLEX_EXPR, r, i); + update_stmt (gsi_stmt (orig_si)); } + /* Generate code at the entry point of the function to initialize the component variables for a complex parameter. */ @@ -549,11 +690,13 @@ update_parameter_components (void) continue; type = TREE_TYPE (type); - ssa_name = default_def (parm); + ssa_name = gimple_default_def (cfun, parm); + if (!ssa_name) + continue; r = build1 (REALPART_EXPR, type, ssa_name); i = build1 (IMAGPART_EXPR, type, ssa_name); - update_complex_components_on_edge (entry_edge, NULL, ssa_name, r, i); + update_complex_components_on_edge (entry_edge, ssa_name, r, i); } } @@ -563,61 +706,78 @@ update_parameter_components (void) static void update_phi_components (basic_block bb) { - tree phi; + gimple_stmt_iterator gsi; - for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi)) - if (is_complex_reg (PHI_RESULT (phi))) - { - unsigned int i, n; - tree lhs = PHI_RESULT (phi); + for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple phi = gsi_stmt (gsi); - for (i = 0, n = PHI_NUM_ARGS (phi); i < n; ++i) - { - edge e = PHI_ARG_EDGE (phi, i); - tree arg = PHI_ARG_DEF (phi, i); - tree r, i; - - /* Avoid no-op assignments. This also prevents insertting stmts - onto abnormal edges, assuming the PHI isn't already broken. */ - if (TREE_CODE (arg) == SSA_NAME - && SSA_NAME_VAR (arg) == SSA_NAME_VAR (lhs)) - continue; - - r = extract_component (NULL, arg, 0, false); - i = extract_component (NULL, arg, 1, false); - update_complex_components_on_edge (e, NULL, lhs, r, i); - } - } -} + if (is_complex_reg (gimple_phi_result (phi))) + { + tree lr, li; + gimple pr = NULL, pi = NULL; + unsigned int i, n; -/* Mark each virtual op in STMT for ssa update. */ + lr = get_component_ssa_name (gimple_phi_result (phi), false); + if (TREE_CODE (lr) == SSA_NAME) + { + pr = create_phi_node (lr, bb); + SSA_NAME_DEF_STMT (lr) = pr; + } -static void -update_all_vops (tree stmt) -{ - ssa_op_iter iter; - tree sym; + li = get_component_ssa_name (gimple_phi_result (phi), true); + if (TREE_CODE (li) == SSA_NAME) + { + pi = create_phi_node (li, bb); + SSA_NAME_DEF_STMT (li) = pi; + } - FOR_EACH_SSA_TREE_OPERAND (sym, stmt, iter, SSA_OP_ALL_VIRTUALS) - { - if (TREE_CODE (sym) == SSA_NAME) - sym = SSA_NAME_VAR (sym); - mark_sym_for_renaming (sym); + for (i = 0, n = gimple_phi_num_args (phi); i < n; ++i) + { + tree comp, arg = gimple_phi_arg_def (phi, i); + if (pr) + { + comp = extract_component (NULL, arg, false, false); + SET_PHI_ARG_DEF (pr, i, comp); + } + if (pi) + { + comp = extract_component (NULL, arg, true, false); + SET_PHI_ARG_DEF (pi, i, comp); + } + } + } } } /* Expand a complex move to scalars. */ static void -expand_complex_move (block_stmt_iterator *bsi, tree stmt, tree type, - tree lhs, tree rhs) +expand_complex_move (gimple_stmt_iterator *gsi, tree type) { tree inner_type = TREE_TYPE (type); - tree r, i; + tree r, i, lhs, rhs; + gimple stmt = gsi_stmt (*gsi); + + if (is_gimple_assign (stmt)) + { + lhs = gimple_assign_lhs (stmt); + if (gimple_num_ops (stmt) == 2) + rhs = gimple_assign_rhs1 (stmt); + else + rhs = NULL_TREE; + } + else if (is_gimple_call (stmt)) + { + lhs = gimple_call_lhs (stmt); + rhs = NULL_TREE; + } + else + gcc_unreachable (); if (TREE_CODE (lhs) == SSA_NAME) { - if (is_ctrl_altering_stmt (bsi_stmt (*bsi))) + if (is_ctrl_altering_stmt (stmt)) { edge_iterator ei; edge e; @@ -625,7 +785,7 @@ expand_complex_move (block_stmt_iterator *bsi, tree stmt, tree type, /* The value is not assigned on the exception edges, so we need not concern ourselves there. We do need to update on the fallthru edge. Find it. */ - FOR_EACH_EDGE (e, ei, bsi->bb->succs) + FOR_EACH_EDGE (e, ei, gsi_bb (*gsi)->succs) if (e->flags & EDGE_FALLTHRU) goto found_fallthru; gcc_unreachable (); @@ -633,52 +793,60 @@ expand_complex_move (block_stmt_iterator *bsi, tree stmt, tree type, r = build1 (REALPART_EXPR, inner_type, lhs); i = build1 (IMAGPART_EXPR, inner_type, lhs); - update_complex_components_on_edge (e, stmt, lhs, r, i); + update_complex_components_on_edge (e, lhs, r, i); } - else if (TREE_CODE (rhs) == CALL_EXPR || TREE_SIDE_EFFECTS (rhs)) + else if (is_gimple_call (stmt) + || gimple_has_side_effects (stmt) + || gimple_assign_rhs_code (stmt) == PAREN_EXPR) { r = build1 (REALPART_EXPR, inner_type, lhs); i = build1 (IMAGPART_EXPR, inner_type, lhs); - update_complex_components (bsi, stmt, r, i); + update_complex_components (gsi, stmt, r, i); } else { - update_all_vops (bsi_stmt (*bsi)); - r = extract_component (bsi, rhs, 0, true); - i = extract_component (bsi, rhs, 1, true); - update_complex_assignment (bsi, r, i); + if (gimple_assign_rhs_code (stmt) != COMPLEX_EXPR) + { + r = extract_component (gsi, rhs, 0, true); + i = extract_component (gsi, rhs, 1, true); + } + else + { + r = gimple_assign_rhs1 (stmt); + i = gimple_assign_rhs2 (stmt); + } + update_complex_assignment (gsi, r, i); } } - else if (TREE_CODE (rhs) == SSA_NAME && !TREE_SIDE_EFFECTS (lhs)) + else if (rhs && TREE_CODE (rhs) == SSA_NAME && !TREE_SIDE_EFFECTS (lhs)) { tree x; + gimple t; - r = extract_component (bsi, rhs, 0, false); - i = extract_component (bsi, rhs, 1, false); + r = extract_component (gsi, rhs, 0, false); + i = extract_component (gsi, rhs, 1, false); x = build1 (REALPART_EXPR, inner_type, unshare_expr (lhs)); - x = build2 (MODIFY_EXPR, inner_type, x, r); - bsi_insert_before (bsi, x, BSI_SAME_STMT); + t = gimple_build_assign (x, r); + gsi_insert_before (gsi, t, GSI_SAME_STMT); - if (stmt == bsi_stmt (*bsi)) + if (stmt == gsi_stmt (*gsi)) { x = build1 (IMAGPART_EXPR, inner_type, unshare_expr (lhs)); - TREE_OPERAND (stmt, 0) = x; - TREE_OPERAND (stmt, 1) = i; - TREE_TYPE (stmt) = inner_type; + gimple_assign_set_lhs (stmt, x); + gimple_assign_set_rhs1 (stmt, i); } else { x = build1 (IMAGPART_EXPR, inner_type, unshare_expr (lhs)); - x = build2 (MODIFY_EXPR, inner_type, x, i); - bsi_insert_before (bsi, x, BSI_SAME_STMT); + t = gimple_build_assign (x, i); + gsi_insert_before (gsi, t, GSI_SAME_STMT); - stmt = bsi_stmt (*bsi); - gcc_assert (TREE_CODE (stmt) == RETURN_EXPR); - TREE_OPERAND (stmt, 0) = lhs; + stmt = gsi_stmt (*gsi); + gcc_assert (gimple_code (stmt) == GIMPLE_RETURN); + gimple_return_set_retval (stmt, lhs); } - update_all_vops (stmt); update_stmt (stmt); } } @@ -689,7 +857,7 @@ expand_complex_move (block_stmt_iterator *bsi, tree stmt, tree type, */ static void -expand_complex_addition (block_stmt_iterator *bsi, tree inner_type, +expand_complex_addition (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai, tree br, tree bi, enum tree_code code, complex_lattice_t al, complex_lattice_t bl) @@ -699,21 +867,21 @@ expand_complex_addition (block_stmt_iterator *bsi, tree inner_type, switch (PAIR (al, bl)) { case PAIR (ONLY_REAL, ONLY_REAL): - rr = gimplify_build2 (bsi, code, inner_type, ar, br); + rr = gimplify_build2 (gsi, code, inner_type, ar, br); ri = ai; break; case PAIR (ONLY_REAL, ONLY_IMAG): rr = ar; if (code == MINUS_EXPR) - ri = gimplify_build2 (bsi, MINUS_EXPR, inner_type, ai, bi); + ri = gimplify_build2 (gsi, MINUS_EXPR, inner_type, ai, bi); else ri = bi; break; case PAIR (ONLY_IMAG, ONLY_REAL): if (code == MINUS_EXPR) - rr = gimplify_build2 (bsi, MINUS_EXPR, inner_type, ar, br); + rr = gimplify_build2 (gsi, MINUS_EXPR, inner_type, ar, br); else rr = br; ri = ai; @@ -721,23 +889,23 @@ expand_complex_addition (block_stmt_iterator *bsi, tree inner_type, case PAIR (ONLY_IMAG, ONLY_IMAG): rr = ar; - ri = gimplify_build2 (bsi, code, inner_type, ai, bi); + ri = gimplify_build2 (gsi, code, inner_type, ai, bi); break; case PAIR (VARYING, ONLY_REAL): - rr = gimplify_build2 (bsi, code, inner_type, ar, br); + rr = gimplify_build2 (gsi, code, inner_type, ar, br); ri = ai; break; case PAIR (VARYING, ONLY_IMAG): rr = ar; - ri = gimplify_build2 (bsi, MINUS_EXPR, inner_type, ai, bi); + ri = gimplify_build2 (gsi, code, inner_type, ai, bi); break; case PAIR (ONLY_REAL, VARYING): if (code == MINUS_EXPR) goto general; - rr = gimplify_build2 (bsi, code, inner_type, ar, br); + rr = gimplify_build2 (gsi, code, inner_type, ar, br); ri = bi; break; @@ -745,61 +913,66 @@ expand_complex_addition (block_stmt_iterator *bsi, tree inner_type, if (code == MINUS_EXPR) goto general; rr = br; - ri = gimplify_build2 (bsi, MINUS_EXPR, inner_type, ai, bi); + ri = gimplify_build2 (gsi, code, inner_type, ai, bi); break; case PAIR (VARYING, VARYING): general: - rr = gimplify_build2 (bsi, code, inner_type, ar, br); - ri = gimplify_build2 (bsi, code, inner_type, ai, bi); + rr = gimplify_build2 (gsi, code, inner_type, ar, br); + ri = gimplify_build2 (gsi, code, inner_type, ai, bi); break; default: gcc_unreachable (); } - update_complex_assignment (bsi, rr, ri); + update_complex_assignment (gsi, rr, ri); } /* Expand a complex multiplication or division to a libcall to the c99 compliant routines. */ static void -expand_complex_libcall (block_stmt_iterator *bsi, tree ar, tree ai, +expand_complex_libcall (gimple_stmt_iterator *gsi, tree ar, tree ai, tree br, tree bi, enum tree_code code) { enum machine_mode mode; enum built_in_function bcode; - tree args, fn, stmt, type; + tree fn, type, lhs; + gimple old_stmt, stmt; - args = tree_cons (NULL, bi, NULL); - args = tree_cons (NULL, br, args); - args = tree_cons (NULL, ai, args); - args = tree_cons (NULL, ar, args); - - stmt = bsi_stmt (*bsi); - type = TREE_TYPE (TREE_OPERAND (stmt, 1)); + old_stmt = gsi_stmt (*gsi); + lhs = gimple_assign_lhs (old_stmt); + type = TREE_TYPE (lhs); mode = TYPE_MODE (type); gcc_assert (GET_MODE_CLASS (mode) == MODE_COMPLEX_FLOAT); + if (code == MULT_EXPR) - bcode = BUILT_IN_COMPLEX_MUL_MIN + mode - MIN_MODE_COMPLEX_FLOAT; + bcode = ((enum built_in_function) + (BUILT_IN_COMPLEX_MUL_MIN + mode - MIN_MODE_COMPLEX_FLOAT)); else if (code == RDIV_EXPR) - bcode = BUILT_IN_COMPLEX_DIV_MIN + mode - MIN_MODE_COMPLEX_FLOAT; + bcode = ((enum built_in_function) + (BUILT_IN_COMPLEX_DIV_MIN + mode - MIN_MODE_COMPLEX_FLOAT)); else gcc_unreachable (); fn = built_in_decls[bcode]; - TREE_OPERAND (stmt, 1) - = build3 (CALL_EXPR, type, build_fold_addr_expr (fn), args, NULL); + stmt = gimple_build_call (fn, 4, ar, ai, br, bi); + gimple_call_set_lhs (stmt, lhs); update_stmt (stmt); + gsi_replace (gsi, stmt, false); - if (in_ssa_p) + if (maybe_clean_or_replace_eh_stmt (old_stmt, stmt)) + gimple_purge_dead_eh_edges (gsi_bb (*gsi)); + + if (gimple_in_ssa_p (cfun)) { - tree lhs = TREE_OPERAND (stmt, 0); - update_complex_components (bsi, stmt, + type = TREE_TYPE (type); + update_complex_components (gsi, stmt, build1 (REALPART_EXPR, type, lhs), build1 (IMAGPART_EXPR, type, lhs)); + SSA_NAME_DEF_STMT (lhs) = stmt; } } @@ -808,7 +981,7 @@ expand_complex_libcall (block_stmt_iterator *bsi, tree ar, tree ai, */ static void -expand_complex_multiplication (block_stmt_iterator *bsi, tree inner_type, +expand_complex_multiplication (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai, tree br, tree bi, complex_lattice_t al, complex_lattice_t bl) { @@ -825,7 +998,7 @@ expand_complex_multiplication (block_stmt_iterator *bsi, tree inner_type, switch (PAIR (al, bl)) { case PAIR (ONLY_REAL, ONLY_REAL): - rr = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, br); + rr = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, br); ri = ai; break; @@ -835,49 +1008,49 @@ expand_complex_multiplication (block_stmt_iterator *bsi, tree inner_type, && REAL_VALUES_IDENTICAL (TREE_REAL_CST (ai), dconst1)) ri = br; else - ri = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, br); + ri = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, br); break; case PAIR (ONLY_IMAG, ONLY_IMAG): - rr = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, bi); - rr = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, rr); + rr = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, bi); + rr = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, rr); ri = ar; break; case PAIR (VARYING, ONLY_REAL): - rr = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, br); - ri = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, br); + rr = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, br); + ri = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, br); break; case PAIR (VARYING, ONLY_IMAG): - rr = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, bi); - rr = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, rr); - ri = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, bi); + rr = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, bi); + rr = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, rr); + ri = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, bi); break; case PAIR (VARYING, VARYING): if (flag_complex_method == 2 && SCALAR_FLOAT_TYPE_P (inner_type)) { - expand_complex_libcall (bsi, ar, ai, br, bi, MULT_EXPR); + expand_complex_libcall (gsi, ar, ai, br, bi, MULT_EXPR); return; } else { tree t1, t2, t3, t4; - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, br); - t2 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, bi); - t3 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, bi); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, br); + t2 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, bi); + t3 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, bi); /* Avoid expanding redundant multiplication for the common case of squaring a complex number. */ if (ar == br && ai == bi) t4 = t3; else - t4 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, br); + t4 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, br); - rr = gimplify_build2 (bsi, MINUS_EXPR, inner_type, t1, t2); - ri = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t3, t4); + rr = gimplify_build2 (gsi, MINUS_EXPR, inner_type, t1, t2); + ri = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t3, t4); } break; @@ -885,76 +1058,91 @@ expand_complex_multiplication (block_stmt_iterator *bsi, tree inner_type, gcc_unreachable (); } - update_complex_assignment (bsi, rr, ri); + update_complex_assignment (gsi, rr, ri); } -/* Expand complex division to scalars, straightforward algorithm. +/* Keep this algorithm in sync with fold-const.c:const_binop(). + + Expand complex division to scalars, straightforward algorithm. a / b = ((ar*br + ai*bi)/t) + i((ai*br - ar*bi)/t) t = br*br + bi*bi */ static void -expand_complex_div_straight (block_stmt_iterator *bsi, tree inner_type, +expand_complex_div_straight (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai, tree br, tree bi, enum tree_code code) { tree rr, ri, div, t1, t2, t3; - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, br, br); - t2 = gimplify_build2 (bsi, MULT_EXPR, inner_type, bi, bi); - div = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t1, t2); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, br, br); + t2 = gimplify_build2 (gsi, MULT_EXPR, inner_type, bi, bi); + div = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t1, t2); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, br); - t2 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, bi); - t3 = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t1, t2); - rr = gimplify_build2 (bsi, code, inner_type, t3, div); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, br); + t2 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, bi); + t3 = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t1, t2); + rr = gimplify_build2 (gsi, code, inner_type, t3, div); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, br); - t2 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, bi); - t3 = gimplify_build2 (bsi, MINUS_EXPR, inner_type, t1, t2); - ri = gimplify_build2 (bsi, code, inner_type, t3, div); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, br); + t2 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, bi); + t3 = gimplify_build2 (gsi, MINUS_EXPR, inner_type, t1, t2); + ri = gimplify_build2 (gsi, code, inner_type, t3, div); - update_complex_assignment (bsi, rr, ri); + update_complex_assignment (gsi, rr, ri); } -/* Expand complex division to scalars, modified algorithm to minimize +/* Keep this algorithm in sync with fold-const.c:const_binop(). + + Expand complex division to scalars, modified algorithm to minimize overflow with wide input ranges. */ static void -expand_complex_div_wide (block_stmt_iterator *bsi, tree inner_type, +expand_complex_div_wide (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai, tree br, tree bi, enum tree_code code) { - tree rr, ri, ratio, div, t1, t2, tr, ti, cond; + tree rr, ri, ratio, div, t1, t2, tr, ti, compare; basic_block bb_cond, bb_true, bb_false, bb_join; + gimple stmt; /* Examine |br| < |bi|, and branch. */ - t1 = gimplify_build1 (bsi, ABS_EXPR, inner_type, br); - t2 = gimplify_build1 (bsi, ABS_EXPR, inner_type, bi); - cond = fold (build (LT_EXPR, boolean_type_node, t1, t2)); - STRIP_NOPS (cond); + t1 = gimplify_build1 (gsi, ABS_EXPR, inner_type, br); + t2 = gimplify_build1 (gsi, ABS_EXPR, inner_type, bi); + compare = fold_build2_loc (gimple_location (gsi_stmt (*gsi)), + LT_EXPR, boolean_type_node, t1, t2); + STRIP_NOPS (compare); bb_cond = bb_true = bb_false = bb_join = NULL; rr = ri = tr = ti = NULL; - if (!TREE_CONSTANT (cond)) + if (TREE_CODE (compare) != INTEGER_CST) { edge e; + gimple stmt; + tree cond, tmp; + + tmp = create_tmp_var (boolean_type_node, NULL); + stmt = gimple_build_assign (tmp, compare); + if (gimple_in_ssa_p (cfun)) + { + tmp = make_ssa_name (tmp, stmt); + gimple_assign_set_lhs (stmt, tmp); + } - cond = build (COND_EXPR, void_type_node, cond, NULL, NULL); - bsi_insert_before (bsi, cond, BSI_SAME_STMT); + gsi_insert_before (gsi, stmt, GSI_SAME_STMT); + + cond = fold_build2_loc (gimple_location (stmt), + EQ_EXPR, boolean_type_node, tmp, boolean_true_node); + stmt = gimple_build_cond_from_tree (cond, NULL_TREE, NULL_TREE); + gsi_insert_before (gsi, stmt, GSI_SAME_STMT); /* Split the original block, and create the TRUE and FALSE blocks. */ - e = split_block (bsi->bb, cond); + e = split_block (gsi_bb (*gsi), stmt); bb_cond = e->src; bb_join = e->dest; bb_true = create_empty_bb (bb_cond); bb_false = create_empty_bb (bb_true); - t1 = build (GOTO_EXPR, void_type_node, tree_block_label (bb_true)); - t2 = build (GOTO_EXPR, void_type_node, tree_block_label (bb_false)); - COND_EXPR_THEN (cond) = t1; - COND_EXPR_ELSE (cond) = t2; - /* Wire the blocks together. */ e->flags = EDGE_TRUE_VALUE; redirect_edge_succ (e, bb_true); @@ -981,35 +1169,35 @@ expand_complex_div_wide (block_stmt_iterator *bsi, tree inner_type, ti = (ai * ratio) - ar; tr = tr / div; ti = ti / div; */ - if (bb_true || integer_nonzerop (cond)) + if (bb_true || integer_nonzerop (compare)) { if (bb_true) { - *bsi = bsi_last (bb_true); - bsi_insert_after (bsi, build_empty_stmt (), BSI_NEW_STMT); + *gsi = gsi_last_bb (bb_true); + gsi_insert_after (gsi, gimple_build_nop (), GSI_NEW_STMT); } - ratio = gimplify_build2 (bsi, code, inner_type, br, bi); + ratio = gimplify_build2 (gsi, code, inner_type, br, bi); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, br, ratio); - div = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t1, bi); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, br, ratio); + div = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t1, bi); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, ratio); - tr = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t1, ai); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, ratio); + tr = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t1, ai); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, ratio); - ti = gimplify_build2 (bsi, MINUS_EXPR, inner_type, t1, ar); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, ratio); + ti = gimplify_build2 (gsi, MINUS_EXPR, inner_type, t1, ar); - tr = gimplify_build2 (bsi, code, inner_type, tr, div); - ti = gimplify_build2 (bsi, code, inner_type, ti, div); + tr = gimplify_build2 (gsi, code, inner_type, tr, div); + ti = gimplify_build2 (gsi, code, inner_type, ti, div); if (bb_true) { - t1 = build (MODIFY_EXPR, inner_type, rr, tr); - bsi_insert_before (bsi, t1, BSI_SAME_STMT); - t1 = build (MODIFY_EXPR, inner_type, ri, ti); - bsi_insert_before (bsi, t1, BSI_SAME_STMT); - bsi_remove (bsi); + stmt = gimple_build_assign (rr, tr); + gsi_insert_before (gsi, stmt, GSI_SAME_STMT); + stmt = gimple_build_assign (ri, ti); + gsi_insert_before (gsi, stmt, GSI_SAME_STMT); + gsi_remove (gsi, true); } } @@ -1020,50 +1208,50 @@ expand_complex_div_wide (block_stmt_iterator *bsi, tree inner_type, ti = b - (a * ratio); tr = tr / div; ti = ti / div; */ - if (bb_false || integer_zerop (cond)) + if (bb_false || integer_zerop (compare)) { if (bb_false) { - *bsi = bsi_last (bb_false); - bsi_insert_after (bsi, build_empty_stmt (), BSI_NEW_STMT); + *gsi = gsi_last_bb (bb_false); + gsi_insert_after (gsi, gimple_build_nop (), GSI_NEW_STMT); } - ratio = gimplify_build2 (bsi, code, inner_type, bi, br); + ratio = gimplify_build2 (gsi, code, inner_type, bi, br); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, bi, ratio); - div = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t1, br); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, bi, ratio); + div = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t1, br); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ai, ratio); - tr = gimplify_build2 (bsi, PLUS_EXPR, inner_type, t1, ar); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, ratio); + tr = gimplify_build2 (gsi, PLUS_EXPR, inner_type, t1, ar); - t1 = gimplify_build2 (bsi, MULT_EXPR, inner_type, ar, ratio); - ti = gimplify_build2 (bsi, MINUS_EXPR, inner_type, ai, t1); + t1 = gimplify_build2 (gsi, MULT_EXPR, inner_type, ar, ratio); + ti = gimplify_build2 (gsi, MINUS_EXPR, inner_type, ai, t1); - tr = gimplify_build2 (bsi, code, inner_type, tr, div); - ti = gimplify_build2 (bsi, code, inner_type, ti, div); + tr = gimplify_build2 (gsi, code, inner_type, tr, div); + ti = gimplify_build2 (gsi, code, inner_type, ti, div); if (bb_false) { - t1 = build (MODIFY_EXPR, inner_type, rr, tr); - bsi_insert_before (bsi, t1, BSI_SAME_STMT); - t1 = build (MODIFY_EXPR, inner_type, ri, ti); - bsi_insert_before (bsi, t1, BSI_SAME_STMT); - bsi_remove (bsi); + stmt = gimple_build_assign (rr, tr); + gsi_insert_before (gsi, stmt, GSI_SAME_STMT); + stmt = gimple_build_assign (ri, ti); + gsi_insert_before (gsi, stmt, GSI_SAME_STMT); + gsi_remove (gsi, true); } } if (bb_join) - *bsi = bsi_start (bb_join); + *gsi = gsi_start_bb (bb_join); else rr = tr, ri = ti; - update_complex_assignment (bsi, rr, ri); + update_complex_assignment (gsi, rr, ri); } /* Expand complex division to scalars. */ static void -expand_complex_division (block_stmt_iterator *bsi, tree inner_type, +expand_complex_division (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai, tree br, tree bi, enum tree_code code, complex_lattice_t al, complex_lattice_t bl) @@ -1073,35 +1261,35 @@ expand_complex_division (block_stmt_iterator *bsi, tree inner_type, switch (PAIR (al, bl)) { case PAIR (ONLY_REAL, ONLY_REAL): - rr = gimplify_build2 (bsi, code, inner_type, ar, br); + rr = gimplify_build2 (gsi, code, inner_type, ar, br); ri = ai; break; case PAIR (ONLY_REAL, ONLY_IMAG): rr = ai; - ri = gimplify_build2 (bsi, code, inner_type, ar, bi); - ri = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, ri); + ri = gimplify_build2 (gsi, code, inner_type, ar, bi); + ri = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, ri); break; case PAIR (ONLY_IMAG, ONLY_REAL): rr = ar; - ri = gimplify_build2 (bsi, code, inner_type, ai, br); + ri = gimplify_build2 (gsi, code, inner_type, ai, br); break; case PAIR (ONLY_IMAG, ONLY_IMAG): - rr = gimplify_build2 (bsi, code, inner_type, ai, bi); + rr = gimplify_build2 (gsi, code, inner_type, ai, bi); ri = ar; break; case PAIR (VARYING, ONLY_REAL): - rr = gimplify_build2 (bsi, code, inner_type, ar, br); - ri = gimplify_build2 (bsi, code, inner_type, ai, br); + rr = gimplify_build2 (gsi, code, inner_type, ar, br); + ri = gimplify_build2 (gsi, code, inner_type, ai, br); break; case PAIR (VARYING, ONLY_IMAG): - rr = gimplify_build2 (bsi, code, inner_type, ai, bi); - ri = gimplify_build2 (bsi, code, inner_type, ar, bi); - ri = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, ri); + rr = gimplify_build2 (gsi, code, inner_type, ai, bi); + ri = gimplify_build2 (gsi, code, inner_type, ar, bi); + ri = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, ri); case PAIR (ONLY_REAL, VARYING): case PAIR (ONLY_IMAG, VARYING): @@ -1110,20 +1298,20 @@ expand_complex_division (block_stmt_iterator *bsi, tree inner_type, { case 0: /* straightforward implementation of complex divide acceptable. */ - expand_complex_div_straight (bsi, inner_type, ar, ai, br, bi, code); + expand_complex_div_straight (gsi, inner_type, ar, ai, br, bi, code); break; case 2: if (SCALAR_FLOAT_TYPE_P (inner_type)) { - expand_complex_libcall (bsi, ar, ai, br, bi, code); + expand_complex_libcall (gsi, ar, ai, br, bi, code); break; } /* FALLTHRU */ case 1: /* wide ranges of inputs must work for complex divide. */ - expand_complex_div_wide (bsi, inner_type, ar, ai, br, bi, code); + expand_complex_div_wide (gsi, inner_type, ar, ai, br, bi, code); break; default: @@ -1135,7 +1323,7 @@ expand_complex_division (block_stmt_iterator *bsi, tree inner_type, gcc_unreachable (); } - update_complex_assignment (bsi, rr, ri); + update_complex_assignment (gsi, rr, ri); } /* Expand complex negation to scalars: @@ -1143,15 +1331,15 @@ expand_complex_division (block_stmt_iterator *bsi, tree inner_type, */ static void -expand_complex_negation (block_stmt_iterator *bsi, tree inner_type, +expand_complex_negation (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai) { tree rr, ri; - rr = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, ar); - ri = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, ai); + rr = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, ar); + ri = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, ai); - update_complex_assignment (bsi, rr, ri); + update_complex_assignment (gsi, rr, ri); } /* Expand complex conjugate to scalars: @@ -1159,44 +1347,52 @@ expand_complex_negation (block_stmt_iterator *bsi, tree inner_type, */ static void -expand_complex_conjugate (block_stmt_iterator *bsi, tree inner_type, +expand_complex_conjugate (gimple_stmt_iterator *gsi, tree inner_type, tree ar, tree ai) { tree ri; - ri = gimplify_build1 (bsi, NEGATE_EXPR, inner_type, ai); + ri = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, ai); - update_complex_assignment (bsi, ar, ri); + update_complex_assignment (gsi, ar, ri); } /* Expand complex comparison (EQ or NE only). */ static void -expand_complex_comparison (block_stmt_iterator *bsi, tree ar, tree ai, +expand_complex_comparison (gimple_stmt_iterator *gsi, tree ar, tree ai, tree br, tree bi, enum tree_code code) { - tree cr, ci, cc, stmt, expr, type; + tree cr, ci, cc, type; + gimple stmt; - cr = gimplify_build2 (bsi, code, boolean_type_node, ar, br); - ci = gimplify_build2 (bsi, code, boolean_type_node, ai, bi); - cc = gimplify_build2 (bsi, + cr = gimplify_build2 (gsi, code, boolean_type_node, ar, br); + ci = gimplify_build2 (gsi, code, boolean_type_node, ai, bi); + cc = gimplify_build2 (gsi, (code == EQ_EXPR ? TRUTH_AND_EXPR : TRUTH_OR_EXPR), boolean_type_node, cr, ci); - stmt = expr = bsi_stmt (*bsi); + stmt = gsi_stmt (*gsi); - switch (TREE_CODE (stmt)) + switch (gimple_code (stmt)) { - case RETURN_EXPR: - expr = TREE_OPERAND (stmt, 0); - /* FALLTHRU */ - case MODIFY_EXPR: - type = TREE_TYPE (TREE_OPERAND (expr, 1)); - TREE_OPERAND (expr, 1) = fold_convert (type, cc); + case GIMPLE_RETURN: + type = TREE_TYPE (gimple_return_retval (stmt)); + gimple_return_set_retval (stmt, fold_convert (type, cc)); break; - case COND_EXPR: - TREE_OPERAND (stmt, 0) = cc; + + case GIMPLE_ASSIGN: + type = TREE_TYPE (gimple_assign_lhs (stmt)); + gimple_assign_set_rhs_from_tree (gsi, fold_convert (type, cc)); + stmt = gsi_stmt (*gsi); break; + + case GIMPLE_COND: + gimple_cond_set_code (stmt, EQ_EXPR); + gimple_cond_set_lhs (stmt, cc); + gimple_cond_set_rhs (stmt, boolean_true_node); + break; + default: gcc_unreachable (); } @@ -1204,41 +1400,24 @@ expand_complex_comparison (block_stmt_iterator *bsi, tree ar, tree ai, update_stmt (stmt); } + /* Process one statement. If we identify a complex operation, expand it. */ static void -expand_complex_operations_1 (block_stmt_iterator *bsi) +expand_complex_operations_1 (gimple_stmt_iterator *gsi) { - tree stmt = bsi_stmt (*bsi); - tree rhs, type, inner_type; + gimple stmt = gsi_stmt (*gsi); + tree type, inner_type, lhs; tree ac, ar, ai, bc, br, bi; complex_lattice_t al, bl; enum tree_code code; - switch (TREE_CODE (stmt)) - { - case RETURN_EXPR: - stmt = TREE_OPERAND (stmt, 0); - if (!stmt) - return; - if (TREE_CODE (stmt) != MODIFY_EXPR) - return; - /* FALLTHRU */ - - case MODIFY_EXPR: - rhs = TREE_OPERAND (stmt, 1); - break; - - case COND_EXPR: - rhs = TREE_OPERAND (stmt, 0); - break; - - default: - return; - } + lhs = gimple_get_lhs (stmt); + if (!lhs && gimple_code (stmt) != GIMPLE_COND) + return; - type = TREE_TYPE (rhs); - code = TREE_CODE (rhs); + type = TREE_TYPE (gimple_op (stmt, 0)); + code = gimple_expr_code (stmt); /* Initial filter for operations we handle. */ switch (code) @@ -1260,25 +1439,36 @@ expand_complex_operations_1 (block_stmt_iterator *bsi) case EQ_EXPR: case NE_EXPR: - inner_type = TREE_TYPE (TREE_OPERAND (rhs, 1)); + /* Note, both GIMPLE_ASSIGN and GIMPLE_COND may have an EQ_EXPR + subocde, so we need to access the operands using gimple_op. */ + inner_type = TREE_TYPE (gimple_op (stmt, 1)); if (TREE_CODE (inner_type) != COMPLEX_TYPE) return; break; default: { - tree lhs = TREE_OPERAND (stmt, 0); - tree rhs = TREE_OPERAND (stmt, 1); + tree rhs; + + /* GIMPLE_COND may also fallthru here, but we do not need to + do anything with it. */ + if (gimple_code (stmt) == GIMPLE_COND) + return; if (TREE_CODE (type) == COMPLEX_TYPE) - expand_complex_move (bsi, stmt, type, lhs, rhs); - else if ((TREE_CODE (rhs) == REALPART_EXPR - || TREE_CODE (rhs) == IMAGPART_EXPR) - && TREE_CODE (TREE_OPERAND (rhs, 0)) == SSA_NAME) + expand_complex_move (gsi, type); + else if (is_gimple_assign (stmt) + && (gimple_assign_rhs_code (stmt) == REALPART_EXPR + || gimple_assign_rhs_code (stmt) == IMAGPART_EXPR) + && TREE_CODE (lhs) == SSA_NAME) { - TREE_OPERAND (stmt, 1) - = extract_component (bsi, TREE_OPERAND (rhs, 0), - TREE_CODE (rhs) == IMAGPART_EXPR, false); + rhs = gimple_assign_rhs1 (stmt); + rhs = extract_component (gsi, TREE_OPERAND (rhs, 0), + gimple_assign_rhs_code (stmt) + == IMAGPART_EXPR, + false); + gimple_assign_set_rhs_from_tree (gsi, rhs); + stmt = gsi_stmt (*gsi); update_stmt (stmt); } } @@ -1287,25 +1477,32 @@ expand_complex_operations_1 (block_stmt_iterator *bsi) /* Extract the components of the two complex values. Make sure and handle the common case of the same value used twice specially. */ - ac = TREE_OPERAND (rhs, 0); - ar = extract_component (bsi, ac, 0, true); - ai = extract_component (bsi, ac, 1, true); - - if (TREE_CODE_CLASS (code) == tcc_unary) - bc = br = bi = NULL; + if (is_gimple_assign (stmt)) + { + ac = gimple_assign_rhs1 (stmt); + bc = (gimple_num_ops (stmt) > 2) ? gimple_assign_rhs2 (stmt) : NULL; + } + /* GIMPLE_CALL can not get here. */ else { - bc = TREE_OPERAND (rhs, 1); - if (ac == bc) - br = ar, bi = ai; - else - { - br = extract_component (bsi, bc, 0, true); - bi = extract_component (bsi, bc, 1, true); - } + ac = gimple_cond_lhs (stmt); + bc = gimple_cond_rhs (stmt); + } + + ar = extract_component (gsi, ac, false, true); + ai = extract_component (gsi, ac, true, true); + + if (ac == bc) + br = ar, bi = ai; + else if (bc) + { + br = extract_component (gsi, bc, 0, true); + bi = extract_component (gsi, bc, 1, true); } + else + br = bi = NULL_TREE; - if (in_ssa_p) + if (gimple_in_ssa_p (cfun)) { al = find_lattice_value (ac); if (al == UNINITIALIZED) @@ -1329,11 +1526,11 @@ expand_complex_operations_1 (block_stmt_iterator *bsi) { case PLUS_EXPR: case MINUS_EXPR: - expand_complex_addition (bsi, inner_type, ar, ai, br, bi, code, al, bl); + expand_complex_addition (gsi, inner_type, ar, ai, br, bi, code, al, bl); break; case MULT_EXPR: - expand_complex_multiplication (bsi, inner_type, ar, ai, br, bi, al, bl); + expand_complex_multiplication (gsi, inner_type, ar, ai, br, bi, al, bl); break; case TRUNC_DIV_EXPR: @@ -1341,20 +1538,20 @@ expand_complex_operations_1 (block_stmt_iterator *bsi) case FLOOR_DIV_EXPR: case ROUND_DIV_EXPR: case RDIV_EXPR: - expand_complex_division (bsi, inner_type, ar, ai, br, bi, code, al, bl); + expand_complex_division (gsi, inner_type, ar, ai, br, bi, code, al, bl); break; - + case NEGATE_EXPR: - expand_complex_negation (bsi, inner_type, ar, ai); + expand_complex_negation (gsi, inner_type, ar, ai); break; case CONJ_EXPR: - expand_complex_conjugate (bsi, inner_type, ar, ai); + expand_complex_conjugate (gsi, inner_type, ar, ai); break; case EQ_EXPR: case NE_EXPR: - expand_complex_comparison (bsi, ar, ai, br, bi, code); + expand_complex_comparison (gsi, ar, ai, br, bi, code); break; default: @@ -1365,102 +1562,101 @@ expand_complex_operations_1 (block_stmt_iterator *bsi) /* Entry point for complex operation lowering during optimization. */ -static void +static unsigned int tree_lower_complex (void) { int old_last_basic_block; - block_stmt_iterator bsi; + gimple_stmt_iterator gsi; basic_block bb; if (!init_dont_simulate_again ()) - return; + return 0; complex_lattice_values = VEC_alloc (complex_lattice_t, heap, num_ssa_names); - VEC_safe_grow (complex_lattice_t, heap, - complex_lattice_values, num_ssa_names); - memset (VEC_address (complex_lattice_t, complex_lattice_values), 0, - num_ssa_names * sizeof(complex_lattice_t)); - init_parameter_lattice_values (); + VEC_safe_grow_cleared (complex_lattice_t, heap, + complex_lattice_values, num_ssa_names); + init_parameter_lattice_values (); ssa_propagate (complex_visit_stmt, complex_visit_phi); - create_components (); + complex_variable_components = htab_create (10, int_tree_map_hash, + int_tree_map_eq, free); + + complex_ssa_name_components = VEC_alloc (tree, heap, 2*num_ssa_names); + VEC_safe_grow_cleared (tree, heap, complex_ssa_name_components, + 2 * num_ssa_names); + update_parameter_components (); + /* ??? Ideally we'd traverse the blocks in breadth-first order. */ old_last_basic_block = last_basic_block; FOR_EACH_BB (bb) { if (bb->index >= old_last_basic_block) continue; + update_phi_components (bb); - for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi)) - expand_complex_operations_1 (&bsi); + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + expand_complex_operations_1 (&gsi); } - bsi_commit_edge_inserts (); + gsi_commit_edge_inserts (); - VEC_free (tree, heap, complex_variable_components); + htab_delete (complex_variable_components); + VEC_free (tree, heap, complex_ssa_name_components); VEC_free (complex_lattice_t, heap, complex_lattice_values); + return 0; } -struct tree_opt_pass pass_lower_complex = +struct gimple_opt_pass pass_lower_complex = { + { + GIMPLE_PASS, "cplxlower", /* name */ 0, /* gate */ tree_lower_complex, /* execute */ NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - 0, /* tv_id */ + TV_NONE, /* tv_id */ PROP_ssa, /* properties_required */ - 0, /* properties_provided */ - 0, /* properties_destroyed */ + PROP_gimple_lcx, /* properties_provided */ + 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func | TODO_ggc_collect + TODO_dump_func + | TODO_ggc_collect | TODO_update_ssa - | TODO_verify_stmts, /* todo_flags_finish */ - 0 /* letter */ + | TODO_verify_stmts /* todo_flags_finish */ + } }; -/* Entry point for complex operation lowering without optimization. */ - -static void -tree_lower_complex_O0 (void) -{ - int old_last_basic_block = last_basic_block; - block_stmt_iterator bsi; - basic_block bb; - - FOR_EACH_BB (bb) - { - if (bb->index >= old_last_basic_block) - continue; - for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi)) - expand_complex_operations_1 (&bsi); - } -} - static bool gate_no_optimization (void) { - return optimize == 0; + /* With errors, normal optimization passes are not run. If we don't + lower complex operations at all, rtl expansion will abort. */ + return !(cfun->curr_properties & PROP_gimple_lcx); } -struct tree_opt_pass pass_lower_complex_O0 = +struct gimple_opt_pass pass_lower_complex_O0 = { + { + GIMPLE_PASS, "cplxlower0", /* name */ gate_no_optimization, /* gate */ - tree_lower_complex_O0, /* execute */ + tree_lower_complex, /* execute */ NULL, /* sub */ NULL, /* next */ 0, /* static_pass_number */ - 0, /* tv_id */ + TV_NONE, /* tv_id */ PROP_cfg, /* properties_required */ - 0, /* properties_provided */ + PROP_gimple_lcx, /* properties_provided */ 0, /* properties_destroyed */ 0, /* todo_flags_start */ - TODO_dump_func | TODO_ggc_collect - | TODO_verify_stmts, /* todo_flags_finish */ - 0 /* letter */ + TODO_dump_func + | TODO_ggc_collect + | TODO_update_ssa + | TODO_verify_stmts /* todo_flags_finish */ + } };