X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-flow-inline.h;h=1a62cdd1f44f99455c3b0b52d9584434e657f4f9;hb=a7446c4eed4f9d388f1d2dfd7feef0490330e195;hp=7b82ba34090e1086f9c611a6bd91860fdb55cb93;hpb=2afb4be3f459389193b437bb0b0413700f93655a;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/tree-flow-inline.h b/gcc/tree-flow-inline.h index 7b82ba34090..1a62cdd1f44 100644 --- a/gcc/tree-flow-inline.h +++ b/gcc/tree-flow-inline.h @@ -1,5 +1,6 @@ /* Inline functions for tree-flow.h - Copyright (C) 2001, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2006, 2007, 2008, 2010 + Free Software Foundation, Inc. Contributed by Diego Novillo This file is part of GCC. @@ -34,37 +35,6 @@ gimple_in_ssa_p (const struct function *fun) return fun && fun->gimple_df && fun->gimple_df->in_ssa_p; } -/* 'true' after aliases have been computed (see compute_may_aliases). */ -static inline bool -gimple_aliases_computed_p (const struct function *fun) -{ - gcc_assert (fun && fun->gimple_df); - return fun->gimple_df->aliases_computed_p; -} - -/* Addressable variables in the function. If bit I is set, then - REFERENCED_VARS (I) has had its address taken. Note that - CALL_CLOBBERED_VARS and ADDRESSABLE_VARS are not related. An - addressable variable is not necessarily call-clobbered (e.g., a - local addressable whose address does not escape) and not all - call-clobbered variables are addressable (e.g., a local static - variable). */ -static inline bitmap -gimple_addressable_vars (const struct function *fun) -{ - gcc_assert (fun && fun->gimple_df); - return fun->gimple_df->addressable_vars; -} - -/* Call clobbered variables in the function. If bit I is set, then - REFERENCED_VARS (I) is call-clobbered. */ -static inline bitmap -gimple_call_clobbered_vars (const struct function *fun) -{ - gcc_assert (fun && fun->gimple_df); - return fun->gimple_df->call_clobbered_vars; -} - /* Array of all variables referenced in the function. */ static inline htab_t gimple_referenced_vars (const struct function *fun) @@ -74,29 +44,12 @@ gimple_referenced_vars (const struct function *fun) return fun->gimple_df->referenced_vars; } -/* Artificial variable used to model the effects of function calls. */ -static inline tree -gimple_global_var (const struct function *fun) -{ - gcc_assert (fun && fun->gimple_df); - return fun->gimple_df->global_var; -} - -/* Artificial variable used to model the effects of nonlocal - variables. */ +/* Artificial variable used for the virtual operand FUD chain. */ static inline tree -gimple_nonlocal_all (const struct function *fun) +gimple_vop (const struct function *fun) { - gcc_assert (fun && fun->gimple_df); - return fun->gimple_df->nonlocal_all; -} - -/* Hashtable of variables annotations. Used for static variables only; - local variables have direct pointer in the tree node. */ -static inline htab_t -gimple_var_anns (const struct function *fun) -{ - return fun->gimple_df->var_anns; + gcc_checking_assert (fun && fun->gimple_df); + return fun->gimple_df->vop; } /* Initialize the hashtable iterator HTI to point to hashtable TABLE */ @@ -113,7 +66,7 @@ first_htab_element (htab_iterator *hti, htab_t table) if (x != HTAB_EMPTY_ENTRY && x != HTAB_DELETED_ENTRY) break; } while (++(hti->slot) < hti->limit); - + if (hti->slot < hti->limit) return *(hti->slot); return NULL; @@ -145,6 +98,16 @@ next_htab_element (htab_iterator *hti) return NULL; } +/* Get the variable with uid UID from the list of referenced vars. */ + +static inline tree +referenced_var (unsigned int uid) +{ + tree var = referenced_var_lookup (uid); + gcc_assert (var || uid == 0); + return var; +} + /* Initialize ITER to point to the first referenced variable in the referenced_vars hashtable, and return that variable. */ @@ -171,18 +134,6 @@ static inline tree next_referenced_var (referenced_var_iterator *iter) { return (tree) next_htab_element (&iter->hti); -} - -/* Fill up VEC with the variables in the referenced vars hashtable. */ - -static inline void -fill_referenced_var_vec (VEC (tree, heap) **vec) -{ - referenced_var_iterator rvi; - tree var; - *vec = NULL; - FOR_EACH_REFERENCED_VAR (var, rvi) - VEC_safe_push (tree, heap, *vec, var); } /* Return the variable annotation for T, which must be a _DECL node. @@ -190,28 +141,8 @@ fill_referenced_var_vec (VEC (tree, heap) **vec) static inline var_ann_t var_ann (const_tree t) { - var_ann_t ann; - - if (!MTAG_P (t) - && (TREE_STATIC (t) || DECL_EXTERNAL (t))) - { - struct static_var_ann_d *sann - = ((struct static_var_ann_d *) - htab_find_with_hash (gimple_var_anns (cfun), t, DECL_UID (t))); - if (!sann) - return NULL; - ann = &sann->ann; - } - else - { - if (!t->base.ann) - return NULL; - ann = (var_ann_t) t->base.ann; - } - - gcc_assert (ann->common.type == VAR_ANN); - - return ann; + const var_ann_t *p = DECL_VAR_ANN_PTR (t); + return p ? *p : NULL; } /* Return the variable annotation for T, which must be a _DECL node. @@ -219,161 +150,47 @@ var_ann (const_tree t) static inline var_ann_t get_var_ann (tree var) { - var_ann_t ann = var_ann (var); - return (ann) ? ann : create_var_ann (var); -} - -/* Return the function annotation for T, which must be a FUNCTION_DECL node. - Return NULL if the function annotation doesn't already exist. */ -static inline function_ann_t -function_ann (const_tree t) -{ - gcc_assert (t); - gcc_assert (TREE_CODE (t) == FUNCTION_DECL); - gcc_assert (!t->base.ann - || t->base.ann->common.type == FUNCTION_ANN); - - return (function_ann_t) t->base.ann; -} - -/* Return the function annotation for T, which must be a FUNCTION_DECL node. - Create the function annotation if it doesn't exist. */ -static inline function_ann_t -get_function_ann (tree var) -{ - function_ann_t ann = function_ann (var); - gcc_assert (!var->base.ann || var->base.ann->common.type == FUNCTION_ANN); - return (ann) ? ann : create_function_ann (var); -} - -/* Return true if T has a statement annotation attached to it. */ - -static inline bool -has_stmt_ann (tree t) -{ -#ifdef ENABLE_CHECKING - gcc_assert (is_gimple_stmt (t)); -#endif - return t->base.ann && t->base.ann->common.type == STMT_ANN; + var_ann_t *p = DECL_VAR_ANN_PTR (var); + gcc_checking_assert (p); + return *p ? *p : create_var_ann (var); } -/* Return the statement annotation for T, which must be a statement - node. Return NULL if the statement annotation doesn't exist. */ -static inline stmt_ann_t -stmt_ann (tree t) -{ -#ifdef ENABLE_CHECKING - gcc_assert (is_gimple_stmt (t)); -#endif - gcc_assert (!t->base.ann || t->base.ann->common.type == STMT_ANN); - return (stmt_ann_t) t->base.ann; -} - -/* Return the statement annotation for T, which must be a statement - node. Create the statement annotation if it doesn't exist. */ -static inline stmt_ann_t -get_stmt_ann (tree stmt) -{ - stmt_ann_t ann = stmt_ann (stmt); - return (ann) ? ann : create_stmt_ann (stmt); -} - -/* Return the annotation type for annotation ANN. */ -static inline enum tree_ann_type -ann_type (tree_ann_t ann) +/* Get the number of the next statement uid to be allocated. */ +static inline unsigned int +gimple_stmt_max_uid (struct function *fn) { - return ann->common.type; + return fn->last_stmt_uid; } -/* Return the basic block for statement T. */ -static inline basic_block -bb_for_stmt (tree t) +/* Set the number of the next statement uid to be allocated. */ +static inline void +set_gimple_stmt_max_uid (struct function *fn, unsigned int maxid) { - stmt_ann_t ann; - - if (TREE_CODE (t) == PHI_NODE) - return PHI_BB (t); - - ann = stmt_ann (t); - return ann ? ann->bb : NULL; + fn->last_stmt_uid = maxid; } -/* Return the may_aliases bitmap for variable VAR, or NULL if it has - no may aliases. */ -static inline bitmap -may_aliases (const_tree var) +/* Set the number of the next statement uid to be allocated. */ +static inline unsigned int +inc_gimple_stmt_max_uid (struct function *fn) { - return MTAG_ALIASES (var); + return fn->last_stmt_uid++; } /* Return the line number for EXPR, or return -1 if we have no line number information for it. */ static inline int -get_lineno (const_tree expr) +get_lineno (const_gimple stmt) { - if (expr == NULL_TREE) - return -1; - - if (TREE_CODE (expr) == COMPOUND_EXPR) - expr = TREE_OPERAND (expr, 0); + location_t loc; - if (! EXPR_HAS_LOCATION (expr)) + if (!stmt) return -1; - return EXPR_LINENO (expr); -} - -/* Return true if T is a noreturn call. */ -static inline bool -noreturn_call_p (tree t) -{ - tree call = get_call_expr_in (t); - return call != 0 && (call_expr_flags (call) & ECF_NORETURN) != 0; -} - -/* Mark statement T as modified. */ -static inline void -mark_stmt_modified (tree t) -{ - stmt_ann_t ann; - if (TREE_CODE (t) == PHI_NODE) - return; - - ann = stmt_ann (t); - if (ann == NULL) - ann = create_stmt_ann (t); - else if (noreturn_call_p (t) && cfun->gimple_df) - VEC_safe_push (tree, gc, MODIFIED_NORETURN_CALLS (cfun), t); - ann->modified = 1; -} - -/* Mark statement T as modified, and update it. */ -static inline void -update_stmt (tree t) -{ - if (TREE_CODE (t) == PHI_NODE) - return; - mark_stmt_modified (t); - update_stmt_operands (t); -} - -static inline void -update_stmt_if_modified (tree t) -{ - if (stmt_modified_p (t)) - update_stmt_operands (t); -} - -/* Return true if T is marked as modified, false otherwise. */ -static inline bool -stmt_modified_p (tree t) -{ - stmt_ann_t ann = stmt_ann (t); + loc = gimple_location (stmt); + if (loc == UNKNOWN_LOCATION) + return -1; - /* Note that if the statement doesn't yet have an annotation, we consider it - modified. This will force the next call to update_stmt_operands to scan - the statement. */ - return ann ? ann->modified : true; + return LOCATION_LINE (loc); } /* Delink an immediate_uses node from its chain. */ @@ -394,7 +211,7 @@ delink_imm_use (ssa_use_operand_t *linknode) static inline void link_imm_use_to_list (ssa_use_operand_t *linknode, ssa_use_operand_t *list) { - /* Link the new node at the head of the list. If we are in the process of + /* Link the new node at the head of the list. If we are in the process of traversing the list, we won't visit any new nodes added to it. */ linknode->prev = list; linknode->next = list->next; @@ -413,10 +230,8 @@ link_imm_use (ssa_use_operand_t *linknode, tree def) else { root = &(SSA_NAME_IMM_USE_NODE (def)); -#ifdef ENABLE_CHECKING if (linknode->use) - gcc_assert (*(linknode->use) == def); -#endif + gcc_checking_assert (*(linknode->use) == def); link_imm_use_to_list (linknode, root); } } @@ -430,16 +245,16 @@ set_ssa_use_from_ptr (use_operand_p use, tree val) link_imm_use (use, val); } -/* Link ssa_imm_use node LINKNODE into the chain for DEF, with use occurring +/* Link ssa_imm_use node LINKNODE into the chain for DEF, with use occurring in STMT. */ static inline void -link_imm_use_stmt (ssa_use_operand_t *linknode, tree def, tree stmt) +link_imm_use_stmt (ssa_use_operand_t *linknode, tree def, gimple stmt) { if (stmt) link_imm_use (linknode, def); else link_imm_use (linknode, NULL); - linknode->stmt = stmt; + linknode->loc.stmt = stmt; } /* Relink a new node in place of an old node in the list. */ @@ -447,7 +262,7 @@ static inline void relink_imm_use (ssa_use_operand_t *node, ssa_use_operand_t *old) { /* The node one had better be in the same list. */ - gcc_assert (*(old->use) == *(node->use)); + gcc_checking_assert (*(old->use) == *(node->use)); node->prev = old->prev; node->next = old->next; if (old->prev) @@ -459,16 +274,17 @@ relink_imm_use (ssa_use_operand_t *node, ssa_use_operand_t *old) } } -/* Relink ssa_imm_use node LINKNODE into the chain for OLD, with use occurring +/* Relink ssa_imm_use node LINKNODE into the chain for OLD, with use occurring in STMT. */ static inline void -relink_imm_use_stmt (ssa_use_operand_t *linknode, ssa_use_operand_t *old, tree stmt) +relink_imm_use_stmt (ssa_use_operand_t *linknode, ssa_use_operand_t *old, + gimple stmt) { if (stmt) relink_imm_use (linknode, old); else link_imm_use (linknode, NULL); - linknode->stmt = stmt; + linknode->loc.stmt = stmt; } @@ -483,8 +299,6 @@ end_readonly_imm_use_p (const imm_use_iterator *imm) static inline use_operand_p first_readonly_imm_use (imm_use_iterator *imm, tree var) { - gcc_assert (TREE_CODE (var) == SSA_NAME); - imm->end_p = &(SSA_NAME_IMM_USE_NODE (var)); imm->imm_use = imm->end_p->next; #ifdef ENABLE_CHECKING @@ -516,43 +330,88 @@ next_readonly_imm_use (imm_use_iterator *imm) return imm->imm_use; } -/* Return true if VAR has no uses. */ +/* tree-cfg.c */ +extern bool has_zero_uses_1 (const ssa_use_operand_t *head); +extern bool single_imm_use_1 (const ssa_use_operand_t *head, + use_operand_p *use_p, gimple *stmt); + +/* Return true if VAR has no nondebug uses. */ static inline bool has_zero_uses (const_tree var) { const ssa_use_operand_t *const ptr = &(SSA_NAME_IMM_USE_NODE (var)); - /* A single use means there is no items in the list. */ - return (ptr == ptr->next); + + /* A single use_operand means there is no items in the list. */ + if (ptr == ptr->next) + return true; + + /* If there are debug stmts, we have to look at each use and see + whether there are any nondebug uses. */ + if (!MAY_HAVE_DEBUG_STMTS) + return false; + + return has_zero_uses_1 (ptr); } -/* Return true if VAR has a single use. */ +/* Return true if VAR has a single nondebug use. */ static inline bool has_single_use (const_tree var) { const ssa_use_operand_t *const ptr = &(SSA_NAME_IMM_USE_NODE (var)); - /* A single use means there is one item in the list. */ - return (ptr != ptr->next && ptr == ptr->next->next); + + /* If there aren't any uses whatsoever, we're done. */ + if (ptr == ptr->next) + return false; + + /* If there's a single use, check that it's not a debug stmt. */ + if (ptr == ptr->next->next) + return !is_gimple_debug (USE_STMT (ptr->next)); + + /* If there are debug stmts, we have to look at each of them. */ + if (!MAY_HAVE_DEBUG_STMTS) + return false; + + return single_imm_use_1 (ptr, NULL, NULL); } -/* If VAR has only a single immediate use, return true, and set USE_P and STMT - to the use pointer and stmt of occurrence. */ +/* If VAR has only a single immediate nondebug use, return true, and + set USE_P and STMT to the use pointer and stmt of occurrence. */ static inline bool -single_imm_use (const_tree var, use_operand_p *use_p, tree *stmt) +single_imm_use (const_tree var, use_operand_p *use_p, gimple *stmt) { const ssa_use_operand_t *const ptr = &(SSA_NAME_IMM_USE_NODE (var)); - if (ptr != ptr->next && ptr == ptr->next->next) + + /* If there aren't any uses whatsoever, we're done. */ + if (ptr == ptr->next) { - *use_p = ptr->next; - *stmt = ptr->next->stmt; - return true; + return_false: + *use_p = NULL_USE_OPERAND_P; + *stmt = NULL; + return false; } - *use_p = NULL_USE_OPERAND_P; - *stmt = NULL_TREE; - return false; + + /* If there's a single use, check that it's not a debug stmt. */ + if (ptr == ptr->next->next) + { + if (!is_gimple_debug (USE_STMT (ptr->next))) + { + *use_p = ptr->next; + *stmt = ptr->next->loc.stmt; + return true; + } + else + goto return_false; + } + + /* If there are debug stmts, we have to look at each of them. */ + if (!MAY_HAVE_DEBUG_STMTS) + goto return_false; + + return single_imm_use_1 (ptr, use_p, stmt); } -/* Return the number of immediate uses of VAR. */ +/* Return the number of nondebug immediate uses of VAR. */ static inline unsigned int num_imm_uses (const_tree var) { @@ -560,81 +419,120 @@ num_imm_uses (const_tree var) const ssa_use_operand_t *ptr; unsigned int num = 0; - for (ptr = start->next; ptr != start; ptr = ptr->next) - num++; + if (!MAY_HAVE_DEBUG_STMTS) + for (ptr = start->next; ptr != start; ptr = ptr->next) + num++; + else + for (ptr = start->next; ptr != start; ptr = ptr->next) + if (!is_gimple_debug (USE_STMT (ptr))) + num++; return num; } -/* Return the tree pointer to by USE. */ +/* Return the tree pointed-to by USE. */ static inline tree get_use_from_ptr (use_operand_p use) -{ +{ return *(use->use); -} +} -/* Return the tree pointer to by DEF. */ +/* Return the tree pointed-to by DEF. */ static inline tree get_def_from_ptr (def_operand_p def) { return *def; } -/* Return a def_operand_p pointer for the result of PHI. */ -static inline def_operand_p -get_phi_result_ptr (tree phi) +/* Return a use_operand_p pointer for argument I of PHI node GS. */ + +static inline use_operand_p +gimple_phi_arg_imm_use_ptr (gimple gs, int i) { - return &(PHI_RESULT_TREE (phi)); + return &gimple_phi_arg (gs, i)->imm_use; } -/* Return a use_operand_p pointer for argument I of phinode PHI. */ -static inline use_operand_p -get_phi_arg_def_ptr (tree phi, int i) +/* Return the tree operand for argument I of PHI node GS. */ + +static inline tree +gimple_phi_arg_def (gimple gs, size_t index) { - return &(PHI_ARG_IMM_USE_NODE (phi,i)); + struct phi_arg_d *pd = gimple_phi_arg (gs, index); + return get_use_from_ptr (&pd->imm_use); } +/* Return a pointer to the tree operand for argument I of PHI node GS. */ -/* Return the bitmap of addresses taken by STMT, or NULL if it takes - no addresses. */ -static inline bitmap -addresses_taken (tree stmt) +static inline tree * +gimple_phi_arg_def_ptr (gimple gs, size_t index) { - stmt_ann_t ann = stmt_ann (stmt); - return ann ? ann->addresses_taken : NULL; + return &gimple_phi_arg (gs, index)->def; } -/* Return the PHI nodes for basic block BB, or NULL if there are no - PHI nodes. */ -static inline tree -phi_nodes (const_basic_block bb) +/* Return the edge associated with argument I of phi node GS. */ + +static inline edge +gimple_phi_arg_edge (gimple gs, size_t i) { - gcc_assert (!(bb->flags & BB_RTL)); - if (!bb->il.tree) - return NULL; - return bb->il.tree->phi_nodes; + return EDGE_PRED (gimple_bb (gs), i); } -/* Return pointer to the list of PHI nodes for basic block BB. */ +/* Return the source location of gimple argument I of phi node GS. */ -static inline tree * -phi_nodes_ptr (basic_block bb) +static inline source_location +gimple_phi_arg_location (gimple gs, size_t i) { - gcc_assert (!(bb->flags & BB_RTL)); - return &bb->il.tree->phi_nodes; + return gimple_phi_arg (gs, i)->locus; } -/* Set list of phi nodes of a basic block BB to L. */ +/* Return the source location of the argument on edge E of phi node GS. */ + +static inline source_location +gimple_phi_arg_location_from_edge (gimple gs, edge e) +{ + return gimple_phi_arg (gs, e->dest_idx)->locus; +} + +/* Set the source location of gimple argument I of phi node GS to LOC. */ static inline void -set_phi_nodes (basic_block bb, tree l) +gimple_phi_arg_set_location (gimple gs, size_t i, source_location loc) { - tree phi; + gimple_phi_arg (gs, i)->locus = loc; +} + +/* Return TRUE if argument I of phi node GS has a location record. */ - gcc_assert (!(bb->flags & BB_RTL)); - bb->il.tree->phi_nodes = l; - for (phi = l; phi; phi = PHI_CHAIN (phi)) - set_bb_for_stmt (phi, bb); +static inline bool +gimple_phi_arg_has_location (gimple gs, size_t i) +{ + return gimple_phi_arg_location (gs, i) != UNKNOWN_LOCATION; +} + + +/* Return the PHI nodes for basic block BB, or NULL if there are no + PHI nodes. */ +static inline gimple_seq +phi_nodes (const_basic_block bb) +{ + gcc_checking_assert (!(bb->flags & BB_RTL)); + if (!bb->il.gimple) + return NULL; + return bb->il.gimple->phi_nodes; +} + +/* Set PHI nodes of a basic block BB to SEQ. */ + +static inline void +set_phi_nodes (basic_block bb, gimple_seq seq) +{ + gimple_stmt_iterator i; + + gcc_checking_assert (!(bb->flags & BB_RTL)); + bb->il.gimple->phi_nodes = seq; + if (seq) + for (i = gsi_start (seq); !gsi_end_p (i); gsi_next (&i)) + gimple_set_bb (gsi_stmt (i), bb); } /* Return the phi argument which contains the specified use. */ @@ -643,28 +541,25 @@ static inline int phi_arg_index_from_use (use_operand_p use) { struct phi_arg_d *element, *root; - int index; - tree phi; + size_t index; + gimple phi; /* Since the use is the first thing in a PHI argument element, we can calculate its index based on casting it to an argument, and performing pointer arithmetic. */ phi = USE_STMT (use); - gcc_assert (TREE_CODE (phi) == PHI_NODE); element = (struct phi_arg_d *)use; - root = &(PHI_ARG_ELT (phi, 0)); + root = gimple_phi_arg (phi, 0); index = element - root; -#ifdef ENABLE_CHECKING - /* Make sure the calculation doesn't have any leftover bytes. If it does, + /* Make sure the calculation doesn't have any leftover bytes. If it does, then imm_use is likely not the first element in phi_arg_d. */ - gcc_assert ( - (((char *)element - (char *)root) % sizeof (struct phi_arg_d)) == 0); - gcc_assert (index >= 0 && index < PHI_ARG_CAPACITY (phi)); -#endif - + gcc_checking_assert ((((char *)element - (char *)root) + % sizeof (struct phi_arg_d)) == 0 + && index < gimple_phi_capacity (phi)); + return index; } @@ -678,17 +573,33 @@ set_is_used (tree var) } -/* Return true if T (assumed to be a DECL) is a global variable. */ +/* Return true if T (assumed to be a DECL) is a global variable. + A variable is considered global if its storage is not automatic. */ static inline bool is_global_var (const_tree t) { - if (MTAG_P (t)) - return (TREE_STATIC (t) || MTAG_GLOBAL (t)); - else - return (TREE_STATIC (t) || DECL_EXTERNAL (t)); + return (TREE_STATIC (t) || DECL_EXTERNAL (t)); +} + + +/* Return true if VAR may be aliased. A variable is considered as + maybe aliased if it has its address taken by the local TU + or possibly by another TU and might be modified through a pointer. */ + +static inline bool +may_be_aliased (const_tree var) +{ + return (TREE_CODE (var) != CONST_DECL + && !((TREE_STATIC (var) || TREE_PUBLIC (var) || DECL_EXTERNAL (var)) + && TREE_READONLY (var) + && !TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (var))) + && (TREE_PUBLIC (var) + || DECL_EXTERNAL (var) + || TREE_ADDRESSABLE (var))); } + /* PHI nodes should contain only ssa_names and invariants. A test for ssa_name is definitely simpler; don't let invalid contents slip in in the meantime. */ @@ -698,127 +609,17 @@ phi_ssa_name_p (const_tree t) { if (TREE_CODE (t) == SSA_NAME) return true; -#ifdef ENABLE_CHECKING - gcc_assert (is_gimple_min_invariant (t)); -#endif + gcc_checking_assert (is_gimple_min_invariant (t)); return false; } -/* ----------------------------------------------------------------------- */ - -/* Returns the list of statements in BB. */ - -static inline tree -bb_stmt_list (const_basic_block bb) -{ - gcc_assert (!(bb->flags & BB_RTL)); - return bb->il.tree->stmt_list; -} - -/* Sets the list of statements in BB to LIST. */ - -static inline void -set_bb_stmt_list (basic_block bb, tree list) -{ - gcc_assert (!(bb->flags & BB_RTL)); - bb->il.tree->stmt_list = list; -} - -/* Return a block_stmt_iterator that points to beginning of basic - block BB. */ -static inline block_stmt_iterator -bsi_start (basic_block bb) -{ - block_stmt_iterator bsi; - if (bb->index < NUM_FIXED_BLOCKS) - { - bsi.tsi.ptr = NULL; - bsi.tsi.container = NULL; - } - else - bsi.tsi = tsi_start (bb_stmt_list (bb)); - bsi.bb = bb; - return bsi; -} - -/* Return a block statement iterator that points to the first non-label - statement in block BB. */ - -static inline block_stmt_iterator -bsi_after_labels (basic_block bb) -{ - block_stmt_iterator bsi = bsi_start (bb); - - while (!bsi_end_p (bsi) && TREE_CODE (bsi_stmt (bsi)) == LABEL_EXPR) - bsi_next (&bsi); - - return bsi; -} - -/* Return a block statement iterator that points to the end of basic - block BB. */ -static inline block_stmt_iterator -bsi_last (basic_block bb) -{ - block_stmt_iterator bsi; - - if (bb->index < NUM_FIXED_BLOCKS) - { - bsi.tsi.ptr = NULL; - bsi.tsi.container = NULL; - } - else - bsi.tsi = tsi_last (bb_stmt_list (bb)); - bsi.bb = bb; - return bsi; -} - -/* Return true if block statement iterator I has reached the end of - the basic block. */ -static inline bool -bsi_end_p (block_stmt_iterator i) -{ - return tsi_end_p (i.tsi); -} - -/* Modify block statement iterator I so that it is at the next - statement in the basic block. */ -static inline void -bsi_next (block_stmt_iterator *i) -{ - tsi_next (&i->tsi); -} - -/* Modify block statement iterator I so that it is at the previous - statement in the basic block. */ -static inline void -bsi_prev (block_stmt_iterator *i) -{ - tsi_prev (&i->tsi); -} - -/* Return the statement that block statement iterator I is currently - at. */ -static inline tree -bsi_stmt (block_stmt_iterator i) -{ - return tsi_stmt (i.tsi); -} - -/* Return a pointer to the statement that block statement iterator I - is currently at. */ -static inline tree * -bsi_stmt_ptr (block_stmt_iterator i) -{ - return tsi_stmt_ptr (i.tsi); -} /* Returns the loop of the statement STMT. */ static inline struct loop * -loop_containing_stmt (tree stmt) +loop_containing_stmt (gimple stmt) { - basic_block bb = bb_for_stmt (stmt); + basic_block bb = gimple_bb (stmt); if (!bb) return NULL; @@ -826,90 +627,6 @@ loop_containing_stmt (tree stmt) } -/* Return the memory partition tag associated with symbol SYM. */ - -static inline tree -memory_partition (tree sym) -{ - tree tag; - - /* MPTs belong to their own partition. */ - if (TREE_CODE (sym) == MEMORY_PARTITION_TAG) - return sym; - - gcc_assert (!is_gimple_reg (sym)); - tag = get_var_ann (sym)->mpt; - -#if defined ENABLE_CHECKING - if (tag) - gcc_assert (TREE_CODE (tag) == MEMORY_PARTITION_TAG); -#endif - - return tag; -} - -/* Return true if NAME is a memory factoring SSA name (i.e., an SSA - name for a memory partition. */ - -static inline bool -factoring_name_p (const_tree name) -{ - return TREE_CODE (SSA_NAME_VAR (name)) == MEMORY_PARTITION_TAG; -} - -/* Return true if VAR is a clobbered by function calls. */ -static inline bool -is_call_clobbered (const_tree var) -{ - if (!MTAG_P (var)) - return var_ann (var)->call_clobbered; - else - return bitmap_bit_p (gimple_call_clobbered_vars (cfun), DECL_UID (var)); -} - -/* Mark variable VAR as being clobbered by function calls. */ -static inline void -mark_call_clobbered (tree var, unsigned int escape_type) -{ - var_ann (var)->escape_mask |= escape_type; - if (!MTAG_P (var)) - var_ann (var)->call_clobbered = true; - bitmap_set_bit (gimple_call_clobbered_vars (cfun), DECL_UID (var)); -} - -/* Clear the call-clobbered attribute from variable VAR. */ -static inline void -clear_call_clobbered (tree var) -{ - var_ann_t ann = var_ann (var); - ann->escape_mask = 0; - if (MTAG_P (var)) - MTAG_GLOBAL (var) = 0; - if (!MTAG_P (var)) - var_ann (var)->call_clobbered = false; - bitmap_clear_bit (gimple_call_clobbered_vars (cfun), DECL_UID (var)); -} - -/* Return the common annotation for T. Return NULL if the annotation - doesn't already exist. */ -static inline tree_ann_common_t -tree_common_ann (const_tree t) -{ - /* Watch out static variables with unshared annotations. */ - if (DECL_P (t) && TREE_CODE (t) == VAR_DECL) - return &var_ann (t)->common; - return &t->base.ann->common; -} - -/* Return a common annotation for T. Create the constant annotation if it - doesn't exist. */ -static inline tree_ann_common_t -get_tree_common_ann (tree t) -{ - tree_ann_common_t ann = tree_common_ann (t); - return (ann) ? ann : create_tree_common_ann (t); -} - /* ----------------------------------------------------------------------- */ /* The following set of routines are used to iterator over various type of @@ -927,35 +644,13 @@ static inline use_operand_p op_iter_next_use (ssa_op_iter *ptr) { use_operand_p use_p; -#ifdef ENABLE_CHECKING - gcc_assert (ptr->iter_type == ssa_op_iter_use); -#endif + gcc_checking_assert (ptr->iter_type == ssa_op_iter_use); if (ptr->uses) { use_p = USE_OP_PTR (ptr->uses); ptr->uses = ptr->uses->next; return use_p; } - if (ptr->vuses) - { - use_p = VUSE_OP_PTR (ptr->vuses, ptr->vuse_index); - if (++(ptr->vuse_index) >= VUSE_NUM (ptr->vuses)) - { - ptr->vuse_index = 0; - ptr->vuses = ptr->vuses->next; - } - return use_p; - } - if (ptr->mayuses) - { - use_p = VDEF_OP_PTR (ptr->mayuses, ptr->mayuse_index); - if (++(ptr->mayuse_index) >= VDEF_NUM (ptr->mayuses)) - { - ptr->mayuse_index = 0; - ptr->mayuses = ptr->mayuses->next; - } - return use_p; - } if (ptr->phi_i < ptr->num_phi) { return PHI_ARG_DEF_PTR (ptr->phi_stmt, (ptr->phi_i)++); @@ -969,21 +664,13 @@ static inline def_operand_p op_iter_next_def (ssa_op_iter *ptr) { def_operand_p def_p; -#ifdef ENABLE_CHECKING - gcc_assert (ptr->iter_type == ssa_op_iter_def); -#endif + gcc_checking_assert (ptr->iter_type == ssa_op_iter_def); if (ptr->defs) { def_p = DEF_OP_PTR (ptr->defs); ptr->defs = ptr->defs->next; return def_p; } - if (ptr->vdefs) - { - def_p = VDEF_RESULT_PTR (ptr->vdefs); - ptr->vdefs = ptr->vdefs->next; - return def_p; - } ptr->done = true; return NULL_DEF_OPERAND_P; } @@ -993,47 +680,19 @@ static inline tree op_iter_next_tree (ssa_op_iter *ptr) { tree val; -#ifdef ENABLE_CHECKING - gcc_assert (ptr->iter_type == ssa_op_iter_tree); -#endif + gcc_checking_assert (ptr->iter_type == ssa_op_iter_tree); if (ptr->uses) { val = USE_OP (ptr->uses); ptr->uses = ptr->uses->next; return val; } - if (ptr->vuses) - { - val = VUSE_OP (ptr->vuses, ptr->vuse_index); - if (++(ptr->vuse_index) >= VUSE_NUM (ptr->vuses)) - { - ptr->vuse_index = 0; - ptr->vuses = ptr->vuses->next; - } - return val; - } - if (ptr->mayuses) - { - val = VDEF_OP (ptr->mayuses, ptr->mayuse_index); - if (++(ptr->mayuse_index) >= VDEF_NUM (ptr->mayuses)) - { - ptr->mayuse_index = 0; - ptr->mayuses = ptr->mayuses->next; - } - return val; - } if (ptr->defs) { val = DEF_OP (ptr->defs); ptr->defs = ptr->defs->next; return val; } - if (ptr->vdefs) - { - val = VDEF_RESULT (ptr->vdefs); - ptr->vdefs = ptr->vdefs->next; - return val; - } ptr->done = true; return NULL_TREE; @@ -1050,46 +709,45 @@ clear_and_done_ssa_iter (ssa_op_iter *ptr) { ptr->defs = NULL; ptr->uses = NULL; - ptr->vuses = NULL; - ptr->vdefs = NULL; - ptr->mayuses = NULL; ptr->iter_type = ssa_op_iter_none; ptr->phi_i = 0; ptr->num_phi = 0; - ptr->phi_stmt = NULL_TREE; + ptr->phi_stmt = NULL; ptr->done = true; - ptr->vuse_index = 0; - ptr->mayuse_index = 0; } /* Initialize the iterator PTR to the virtual defs in STMT. */ static inline void -op_iter_init (ssa_op_iter *ptr, tree stmt, int flags) -{ -#ifdef ENABLE_CHECKING - gcc_assert (stmt_ann (stmt)); -#endif - - ptr->defs = (flags & SSA_OP_DEF) ? DEF_OPS (stmt) : NULL; - ptr->uses = (flags & SSA_OP_USE) ? USE_OPS (stmt) : NULL; - ptr->vuses = (flags & SSA_OP_VUSE) ? VUSE_OPS (stmt) : NULL; - ptr->vdefs = (flags & SSA_OP_VDEF) ? VDEF_OPS (stmt) : NULL; - ptr->mayuses = (flags & SSA_OP_VMAYUSE) ? VDEF_OPS (stmt) : NULL; +op_iter_init (ssa_op_iter *ptr, gimple stmt, int flags) +{ + /* We do not support iterating over virtual defs or uses without + iterating over defs or uses at the same time. */ + gcc_checking_assert ((!(flags & SSA_OP_VDEF) || (flags & SSA_OP_DEF)) + && (!(flags & SSA_OP_VUSE) || (flags & SSA_OP_USE))); + ptr->defs = (flags & (SSA_OP_DEF|SSA_OP_VDEF)) ? gimple_def_ops (stmt) : NULL; + if (!(flags & SSA_OP_VDEF) + && ptr->defs + && gimple_vdef (stmt) != NULL_TREE) + ptr->defs = ptr->defs->next; + ptr->uses = (flags & (SSA_OP_USE|SSA_OP_VUSE)) ? gimple_use_ops (stmt) : NULL; + if (!(flags & SSA_OP_VUSE) + && ptr->uses + && gimple_vuse (stmt) != NULL_TREE) + ptr->uses = ptr->uses->next; ptr->done = false; ptr->phi_i = 0; ptr->num_phi = 0; - ptr->phi_stmt = NULL_TREE; - ptr->vuse_index = 0; - ptr->mayuse_index = 0; + ptr->phi_stmt = NULL; } /* Initialize iterator PTR to the use operands in STMT based on FLAGS. Return the first use. */ static inline use_operand_p -op_iter_init_use (ssa_op_iter *ptr, tree stmt, int flags) +op_iter_init_use (ssa_op_iter *ptr, gimple stmt, int flags) { - gcc_assert ((flags & SSA_OP_ALL_DEFS) == 0); + gcc_checking_assert ((flags & SSA_OP_ALL_DEFS) == 0 + && (flags & SSA_OP_USE)); op_iter_init (ptr, stmt, flags); ptr->iter_type = ssa_op_iter_use; return op_iter_next_use (ptr); @@ -1098,9 +756,10 @@ op_iter_init_use (ssa_op_iter *ptr, tree stmt, int flags) /* Initialize iterator PTR to the def operands in STMT based on FLAGS. Return the first def. */ static inline def_operand_p -op_iter_init_def (ssa_op_iter *ptr, tree stmt, int flags) +op_iter_init_def (ssa_op_iter *ptr, gimple stmt, int flags) { - gcc_assert ((flags & SSA_OP_ALL_USES) == 0); + gcc_checking_assert ((flags & SSA_OP_ALL_USES) == 0 + && (flags & SSA_OP_DEF)); op_iter_init (ptr, stmt, flags); ptr->iter_type = ssa_op_iter_def; return op_iter_next_def (ptr); @@ -1109,70 +768,18 @@ op_iter_init_def (ssa_op_iter *ptr, tree stmt, int flags) /* Initialize iterator PTR to the operands in STMT based on FLAGS. Return the first operand as a tree. */ static inline tree -op_iter_init_tree (ssa_op_iter *ptr, tree stmt, int flags) +op_iter_init_tree (ssa_op_iter *ptr, gimple stmt, int flags) { op_iter_init (ptr, stmt, flags); ptr->iter_type = ssa_op_iter_tree; return op_iter_next_tree (ptr); } -/* Get the next iterator mustdef value for PTR, returning the mustdef values in - KILL and DEF. */ -static inline void -op_iter_next_vdef (vuse_vec_p *use, def_operand_p *def, - ssa_op_iter *ptr) -{ -#ifdef ENABLE_CHECKING - gcc_assert (ptr->iter_type == ssa_op_iter_vdef); -#endif - if (ptr->mayuses) - { - *def = VDEF_RESULT_PTR (ptr->mayuses); - *use = VDEF_VECT (ptr->mayuses); - ptr->mayuses = ptr->mayuses->next; - return; - } - - *def = NULL_DEF_OPERAND_P; - *use = NULL; - ptr->done = true; - return; -} - - -static inline void -op_iter_next_mustdef (use_operand_p *use, def_operand_p *def, - ssa_op_iter *ptr) -{ - vuse_vec_p vp; - op_iter_next_vdef (&vp, def, ptr); - if (vp != NULL) - { - gcc_assert (VUSE_VECT_NUM_ELEM (*vp) == 1); - *use = VUSE_ELEMENT_PTR (*vp, 0); - } - else - *use = NULL_USE_OPERAND_P; -} - -/* Initialize iterator PTR to the operands in STMT. Return the first operands - in USE and DEF. */ -static inline void -op_iter_init_vdef (ssa_op_iter *ptr, tree stmt, vuse_vec_p *use, - def_operand_p *def) -{ - gcc_assert (TREE_CODE (stmt) != PHI_NODE); - - op_iter_init (ptr, stmt, SSA_OP_VMAYUSE); - ptr->iter_type = ssa_op_iter_vdef; - op_iter_next_vdef (use, def, ptr); -} - /* If there is a single operand in STMT matching FLAGS, return it. Otherwise return NULL. */ static inline tree -single_ssa_tree_operand (tree stmt, int flags) +single_ssa_tree_operand (gimple stmt, int flags) { tree var; ssa_op_iter iter; @@ -1190,7 +797,7 @@ single_ssa_tree_operand (tree stmt, int flags) /* If there is a single operand in STMT matching FLAGS, return it. Otherwise return NULL. */ static inline use_operand_p -single_ssa_use_operand (tree stmt, int flags) +single_ssa_use_operand (gimple stmt, int flags) { use_operand_p var; ssa_op_iter iter; @@ -1209,7 +816,7 @@ single_ssa_use_operand (tree stmt, int flags) /* If there is a single operand in STMT matching FLAGS, return it. Otherwise return NULL. */ static inline def_operand_p -single_ssa_def_operand (tree stmt, int flags) +single_ssa_def_operand (gimple stmt, int flags) { def_operand_p var; ssa_op_iter iter; @@ -1224,10 +831,10 @@ single_ssa_def_operand (tree stmt, int flags) } -/* Return true if there are zero operands in STMT matching the type +/* Return true if there are zero operands in STMT matching the type given in FLAGS. */ static inline bool -zero_ssa_operands (tree stmt, int flags) +zero_ssa_operands (gimple stmt, int flags) { ssa_op_iter iter; @@ -1238,7 +845,7 @@ zero_ssa_operands (tree stmt, int flags) /* Return the number of operands matching FLAGS in STMT. */ static inline int -num_ssa_operands (tree stmt, int flags) +num_ssa_operands (gimple stmt, int flags) { ssa_op_iter iter; tree t; @@ -1252,7 +859,7 @@ num_ssa_operands (tree stmt, int flags) /* Delink all immediate_use information for STMT. */ static inline void -delink_stmt_imm_use (tree stmt) +delink_stmt_imm_use (gimple stmt) { ssa_op_iter iter; use_operand_p use_p; @@ -1263,59 +870,13 @@ delink_stmt_imm_use (tree stmt) } -/* This routine will compare all the operands matching FLAGS in STMT1 to those - in STMT2. TRUE is returned if they are the same. STMTs can be NULL. */ -static inline bool -compare_ssa_operands_equal (tree stmt1, tree stmt2, int flags) -{ - ssa_op_iter iter1, iter2; - tree op1 = NULL_TREE; - tree op2 = NULL_TREE; - bool look1, look2; - - if (stmt1 == stmt2) - return true; - - look1 = stmt1 && stmt_ann (stmt1); - look2 = stmt2 && stmt_ann (stmt2); - - if (look1) - { - op1 = op_iter_init_tree (&iter1, stmt1, flags); - if (!look2) - return op_iter_done (&iter1); - } - else - clear_and_done_ssa_iter (&iter1); - - if (look2) - { - op2 = op_iter_init_tree (&iter2, stmt2, flags); - if (!look1) - return op_iter_done (&iter2); - } - else - clear_and_done_ssa_iter (&iter2); - - while (!op_iter_done (&iter1) && !op_iter_done (&iter2)) - { - if (op1 != op2) - return false; - op1 = op_iter_next_tree (&iter1); - op2 = op_iter_next_tree (&iter2); - } - - return (op_iter_done (&iter1) && op_iter_done (&iter2)); -} - - /* If there is a single DEF in the PHI node which matches FLAG, return it. Otherwise return NULL_DEF_OPERAND_P. */ static inline tree -single_phi_def (tree stmt, int flags) +single_phi_def (gimple stmt, int flags) { tree def = PHI_RESULT (stmt); - if ((flags & SSA_OP_DEF) && is_gimple_reg (def)) + if ((flags & SSA_OP_DEF) && is_gimple_reg (def)) return def; if ((flags & SSA_OP_VIRTUAL_DEFS) && !is_gimple_reg (def)) return def; @@ -1325,18 +886,18 @@ single_phi_def (tree stmt, int flags) /* Initialize the iterator PTR for uses matching FLAGS in PHI. FLAGS should be either SSA_OP_USES or SSA_OP_VIRTUAL_USES. */ static inline use_operand_p -op_iter_init_phiuse (ssa_op_iter *ptr, tree phi, int flags) +op_iter_init_phiuse (ssa_op_iter *ptr, gimple phi, int flags) { - tree phi_def = PHI_RESULT (phi); + tree phi_def = gimple_phi_result (phi); int comp; clear_and_done_ssa_iter (ptr); ptr->done = false; - gcc_assert ((flags & (SSA_OP_USE | SSA_OP_VIRTUAL_USES)) != 0); + gcc_checking_assert ((flags & (SSA_OP_USE | SSA_OP_VIRTUAL_USES)) != 0); comp = (is_gimple_reg (phi_def) ? SSA_OP_USE : SSA_OP_VIRTUAL_USES); - + /* If the PHI node doesn't the operand type we care about, we're done. */ if ((flags & comp) == 0) { @@ -1345,7 +906,7 @@ op_iter_init_phiuse (ssa_op_iter *ptr, tree phi, int flags) } ptr->phi_stmt = phi; - ptr->num_phi = PHI_NUM_ARGS (phi); + ptr->num_phi = gimple_phi_num_args (phi); ptr->iter_type = ssa_op_iter_use; return op_iter_next_use (ptr); } @@ -1354,7 +915,7 @@ op_iter_init_phiuse (ssa_op_iter *ptr, tree phi, int flags) /* Start an iterator for a PHI definition. */ static inline def_operand_p -op_iter_init_phidef (ssa_op_iter *ptr, tree phi, int flags) +op_iter_init_phidef (ssa_op_iter *ptr, gimple phi, int flags) { tree phi_def = PHI_RESULT (phi); int comp; @@ -1362,15 +923,16 @@ op_iter_init_phidef (ssa_op_iter *ptr, tree phi, int flags) clear_and_done_ssa_iter (ptr); ptr->done = false; - gcc_assert ((flags & (SSA_OP_DEF | SSA_OP_VIRTUAL_DEFS)) != 0); + gcc_checking_assert ((flags & (SSA_OP_DEF | SSA_OP_VIRTUAL_DEFS)) != 0); comp = (is_gimple_reg (phi_def) ? SSA_OP_DEF : SSA_OP_VIRTUAL_DEFS); - - /* If the PHI node doesn't the operand type we care about, we're done. */ + + /* If the PHI node doesn't have the operand type we care about, + we're done. */ if ((flags & comp) == 0) { ptr->done = true; - return NULL_USE_OPERAND_P; + return NULL_DEF_OPERAND_P; } ptr->iter_type = ssa_op_iter_def; @@ -1399,15 +961,15 @@ end_imm_use_stmt_traverse (imm_use_iterator *imm) /* Immediate use traversal of uses within a stmt require that all the uses on a stmt be sequentially listed. This routine is used to build up - this sequential list by adding USE_P to the end of the current list - currently delimited by HEAD and LAST_P. The new LAST_P value is + this sequential list by adding USE_P to the end of the current list + currently delimited by HEAD and LAST_P. The new LAST_P value is returned. */ static inline use_operand_p -move_use_after_head (use_operand_p use_p, use_operand_p head, +move_use_after_head (use_operand_p use_p, use_operand_p head, use_operand_p last_p) { - gcc_assert (USE_FROM_PTR (use_p) == USE_FROM_PTR (head)); + gcc_checking_assert (USE_FROM_PTR (use_p) == USE_FROM_PTR (head)); /* Skip head when we find it. */ if (use_p != head) { @@ -1434,7 +996,7 @@ link_use_stmts_after (use_operand_p head, imm_use_iterator *imm) { use_operand_p use_p; use_operand_p last_p = head; - tree head_stmt = USE_STMT (head); + gimple head_stmt = USE_STMT (head); tree use = USE_FROM_PTR (head); ssa_op_iter op_iter; int flag; @@ -1442,7 +1004,7 @@ link_use_stmts_after (use_operand_p head, imm_use_iterator *imm) /* Only look at virtual or real uses, depending on the type of HEAD. */ flag = (is_gimple_reg (use) ? SSA_OP_USE : SSA_OP_VIRTUAL_USES); - if (TREE_CODE (head_stmt) == PHI_NODE) + if (gimple_code (head_stmt) == GIMPLE_PHI) { FOR_EACH_PHI_ARG (use_p, head_stmt, op_iter, flag) if (USE_FROM_PTR (use_p) == use) @@ -1450,22 +1012,28 @@ link_use_stmts_after (use_operand_p head, imm_use_iterator *imm) } else { - FOR_EACH_SSA_USE_OPERAND (use_p, head_stmt, op_iter, flag) - if (USE_FROM_PTR (use_p) == use) - last_p = move_use_after_head (use_p, head, last_p); + if (flag == SSA_OP_USE) + { + FOR_EACH_SSA_USE_OPERAND (use_p, head_stmt, op_iter, flag) + if (USE_FROM_PTR (use_p) == use) + last_p = move_use_after_head (use_p, head, last_p); + } + else if ((use_p = gimple_vuse_op (head_stmt)) != NULL_USE_OPERAND_P) + { + if (USE_FROM_PTR (use_p) == use) + last_p = move_use_after_head (use_p, head, last_p); + } } - /* LInk iter node in after last_p. */ + /* Link iter node in after last_p. */ if (imm->iter_node.prev != NULL) delink_imm_use (&imm->iter_node); link_imm_use_to_list (&(imm->iter_node), last_p); } /* Initialize IMM to traverse over uses of VAR. Return the first statement. */ -static inline tree +static inline gimple first_imm_use_stmt (imm_use_iterator *imm, tree var) { - gcc_assert (TREE_CODE (var) == SSA_NAME); - imm->end_p = &(SSA_NAME_IMM_USE_NODE (var)); imm->imm_use = imm->end_p->next; imm->next_imm_name = NULL_USE_OPERAND_P; @@ -1475,11 +1043,11 @@ first_imm_use_stmt (imm_use_iterator *imm, tree var) stmt and use, which indicates a marker node. */ imm->iter_node.prev = NULL_USE_OPERAND_P; imm->iter_node.next = NULL_USE_OPERAND_P; - imm->iter_node.stmt = NULL_TREE; - imm->iter_node.use = NULL_USE_OPERAND_P; + imm->iter_node.loc.stmt = NULL; + imm->iter_node.use = NULL; if (end_imm_use_stmt_p (imm)) - return NULL_TREE; + return NULL; link_use_stmts_after (imm->imm_use, imm); @@ -1488,7 +1056,7 @@ first_imm_use_stmt (imm_use_iterator *imm, tree var) /* Bump IMM to the next stmt which has a use of var. */ -static inline tree +static inline gimple next_imm_use_stmt (imm_use_iterator *imm) { imm->imm_use = imm->iter_node.next; @@ -1496,7 +1064,7 @@ next_imm_use_stmt (imm_use_iterator *imm) { if (imm->iter_node.prev != NULL) delink_imm_use (&imm->iter_node); - return NULL_TREE; + return NULL; } link_use_stmts_after (imm->imm_use, imm); @@ -1544,33 +1112,16 @@ unmodifiable_var_p (const_tree var) if (TREE_CODE (var) == SSA_NAME) var = SSA_NAME_VAR (var); - if (MTAG_P (var)) - return TREE_READONLY (var) && (TREE_STATIC (var) || MTAG_GLOBAL (var)); - return TREE_READONLY (var) && (TREE_STATIC (var) || DECL_EXTERNAL (var)); } -/* Return true if REF, an ARRAY_REF, has an INDIRECT_REF somewhere in it. */ - -static inline bool -array_ref_contains_indirect_ref (const_tree ref) -{ - gcc_assert (TREE_CODE (ref) == ARRAY_REF); - - do { - ref = TREE_OPERAND (ref, 0); - } while (handled_component_p (ref)); - - return TREE_CODE (ref) == INDIRECT_REF; -} - /* Return true if REF, a handled component reference, has an ARRAY_REF somewhere in it. */ static inline bool ref_contains_array_ref (const_tree ref) { - gcc_assert (handled_component_p (ref)); + gcc_checking_assert (handled_component_p (ref)); do { if (TREE_CODE (ref) == ARRAY_REF) @@ -1581,36 +1132,21 @@ ref_contains_array_ref (const_tree ref) return false; } - -/* Return true if V is a tree that we can have subvars for. - Normally, this is any aggregate type. Also complex - types which are not gimple registers can have subvars. */ +/* Return true if REF has an VIEW_CONVERT_EXPR somewhere in it. */ static inline bool -var_can_have_subvars (const_tree v) +contains_view_convert_expr_p (const_tree ref) { - /* Volatile variables should never have subvars. */ - if (TREE_THIS_VOLATILE (v)) - return false; - - /* Non decls or memory tags can never have subvars. */ - if (!DECL_P (v) || MTAG_P (v)) - return false; - - /* Aggregates can have subvars. */ - if (AGGREGATE_TYPE_P (TREE_TYPE (v))) - return true; - - /* Complex types variables which are not also a gimple register can - have subvars. */ - if (TREE_CODE (TREE_TYPE (v)) == COMPLEX_TYPE - && !DECL_GIMPLE_REG_P (v)) - return true; + while (handled_component_p (ref)) + { + if (TREE_CODE (ref) == VIEW_CONVERT_EXPR) + return true; + ref = TREE_OPERAND (ref, 0); + } return false; } - /* Return true, if the two ranges [POS1, SIZE1] and [POS2, SIZE2] overlap. SIZE1 and/or SIZE2 can be (unsigned)-1 in which case the range is open-ended. Otherwise return false. */ @@ -1633,63 +1169,6 @@ ranges_overlap_p (unsigned HOST_WIDE_INT pos1, return false; } -/* Return the memory tag associated with symbol SYM. */ - -static inline tree -symbol_mem_tag (tree sym) -{ - tree tag = get_var_ann (sym)->symbol_mem_tag; - -#if defined ENABLE_CHECKING - if (tag) - gcc_assert (TREE_CODE (tag) == SYMBOL_MEMORY_TAG); -#endif - - return tag; -} - - -/* Set the memory tag associated with symbol SYM. */ - -static inline void -set_symbol_mem_tag (tree sym, tree tag) -{ -#if defined ENABLE_CHECKING - if (tag) - gcc_assert (TREE_CODE (tag) == SYMBOL_MEMORY_TAG); -#endif - - get_var_ann (sym)->symbol_mem_tag = tag; -} - -/* Get the value handle of EXPR. This is the only correct way to get - the value handle for a "thing". If EXPR does not have a value - handle associated, it returns NULL_TREE. - NB: If EXPR is min_invariant, this function is *required* to return - EXPR. */ - -static inline tree -get_value_handle (tree expr) -{ - if (TREE_CODE (expr) == SSA_NAME) - return SSA_NAME_VALUE (expr); - else if (DECL_P (expr) || TREE_CODE (expr) == TREE_LIST - || TREE_CODE (expr) == CONSTRUCTOR) - { - tree_ann_common_t ann = tree_common_ann (expr); - return ((ann) ? ann->value_handle : NULL_TREE); - } - else if (is_gimple_min_invariant (expr)) - return expr; - else if (EXPR_P (expr)) - { - tree_ann_common_t ann = tree_common_ann (expr); - return ((ann) ? ann->value_handle : NULL_TREE); - } - else - gcc_unreachable (); -} - /* Accessor to tree-ssa-operands.c caches. */ static inline struct ssa_operands * gimple_ssa_operands (const struct function *fun) @@ -1697,13 +1176,6 @@ gimple_ssa_operands (const struct function *fun) return &fun->gimple_df->ssa_operands; } -/* Map describing reference statistics for function FN. */ -static inline struct mem_ref_stats_d * -gimple_mem_ref_stats (const struct function *fn) -{ - return &fn->gimple_df->mem_ref_stats; -} - /* Given an edge_var_map V, return the PHI arg definition. */ static inline tree @@ -1719,4 +1191,23 @@ redirect_edge_var_map_result (edge_var_map *v) { return v->result; } + +/* Given an edge_var_map V, return the PHI arg location. */ + +static inline source_location +redirect_edge_var_map_location (edge_var_map *v) +{ + return v->locus; +} + + +/* Return an SSA_NAME node for variable VAR defined in statement STMT + in function cfun. */ + +static inline tree +make_ssa_name (tree var, gimple stmt) +{ + return make_ssa_name_fn (cfun, var, stmt); +} + #endif /* _TREE_FLOW_INLINE_H */