Skip to content

R
riscv-gcc-1
Commit 46842bfe by Jan Hubicka Committed by Jan Hubicka
Options

tree-ssa-ccp.c (prop_value_d): Rename to ... 


	* tree-ssa-ccp.c (prop_value_d): Rename to ...
	(ccp_prop_value_t): ... this one to avoid ODR violation; update uses.
	* ipa-prop.c (struct type_change_info): Rename to ...
	(prop_type_change_info): ... this; update uses.
	* ggc-page.c (globals): Rename to ...
	(static struct ggc_globals): ... this; update uses.
	* tree-ssa-loop-im.c (mem_ref): Rename to ...
	(im_mem_ref): ... this; update uses.
	* ggc-common.c (loc_descriptor): Rename to ...
	(ggc_loc_descriptor): ... this; update uses.
	* lra-eliminations.c (elim_table): Rename to ...
	(lra_elim_table): ... this; update uses.
	* bitmap.c (output_info): Rename to ...
	(bitmap_output_info): ... this; update uses.
	* gcse.c (expr): Rename to ...
	(gcse_expr) ... this; update uses.
	(occr): Rename to ...
	(gcse_occr): .. this; update uses.
	* tree-ssa-copy.c (prop_value_d): Rename to ...
	(prop_value_t): ... this.
	* predict.c (block_info_def): Rename to ...
	(block_info): ... this; update uses.
	(edge_info_def): Rename to ...
	(edge_info): ... this; update uses.
	* profile.c (bb_info): Rename to ...
	(bb_profile_info): ... this; update uses.
	* alloc-pool.c (output_info): Rename to ...
	(pool_output_info): ... this; update uses.
	* ipa-cp.c (topo_info): Rename to ..
	(ipa_topo_info): ... this; update uses.
	* tree-nrv.c (nrv_data): Rename to ...
	(nrv_data_t): ... this; update uses.
	* ipa-split.c (bb_info): Rename to ...
	(split_bb_info): ... this one.
	* profile.h (edge_info): Rename to ...
	(edge_profile_info): ... this one; update uses.
	* dse.c (bb_info): Rename to ...
	(dse_bb_info): ... this one; update uses.
	* cprop.c (occr): Rename to ...
	(cprop_occr): ... this one; update uses.
	(expr): Rename to ...
	(cprop_expr): ... this one; update uses.

From-SVN: r215481
parent 11478306
Showing with 26 additions and 21 deletions
gcc/fortran/ChangeLog
2014-09-21 Jan Hubicka <hubicka@ucw.cz>
* openmp.c (omp_context): Rename to ...
(fortran_omp_context): ... this one.
2014-09-21 Dominique d'Humieres <dominiq@lps.ens.fr>
* resolve.c (resolve_fl_procedure): Remove duplicated lines.
......
gcc/fortran/openmp.c
......@@ -3015,12 +3015,12 @@ resolve_omp_atomic (gfc_code *code)
}
struct omp_context
struct fortran_omp_context
{
gfc_code *code;
hash_set<gfc_symbol *> *sharing_clauses;
hash_set<gfc_symbol *> *private_iterators;
struct omp_context *previous;
struct fortran_omp_context *previous;
} *omp_current_ctx;
static gfc_code *omp_current_do_code;
static int omp_current_do_collapse;
......@@ -3056,7 +3056,7 @@ gfc_resolve_omp_do_blocks (gfc_code *code, gfc_namespace *ns)
void
gfc_resolve_omp_parallel_blocks (gfc_code *code, gfc_namespace *ns)
{
struct omp_context ctx;
struct fortran_omp_context ctx;
gfc_omp_clauses *omp_clauses = code->ext.omp_clauses;
gfc_omp_namelist *n;
int list;
......@@ -3126,7 +3126,7 @@ gfc_omp_save_and_clear_state (struct gfc_omp_saved_state *state)
void
gfc_omp_restore_state (struct gfc_omp_saved_state *state)
{
omp_current_ctx = (struct omp_context *) state->ptrs[0];
omp_current_ctx = (struct fortran_omp_context *) state->ptrs[0];
omp_current_do_code = (gfc_code *) state->ptrs[1];
omp_current_do_collapse = state->ints[0];
}
......
gcc/profile.c
......@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3. If not see
#include "profile.h"
struct bb_info {
struct bb_profile_info {
unsigned int count_valid : 1;
/* Number of successor and predecessor edges. */
......@@ -82,7 +82,7 @@ struct bb_info {
gcov_type pred_count;
};
#define BB_INFO(b) ((struct bb_info *) (b)->aux)
#define BB_INFO(b) ((struct bb_profile_info *) (b)->aux)
/* Counter summary from the last set of coverage counts read. */
......@@ -128,7 +128,7 @@ instrument_edges (struct edge_list *el)
FOR_EACH_EDGE (e, ei, bb->succs)
{
struct edge_info *inf = EDGE_INFO (e);
struct edge_profile_info *inf = EDGE_INFO (e);
if (!inf->ignore && !inf->on_tree)
{
......@@ -542,7 +542,7 @@ compute_branch_probabilities (unsigned cfg_checksum, unsigned lineno_checksum)
}
/* Attach extra info block to each bb. */
alloc_aux_for_blocks (sizeof (struct bb_info));
alloc_aux_for_blocks (sizeof (struct bb_profile_info));
FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR_FOR_FN (cfun), NULL, next_bb)
{
edge e;
......@@ -590,7 +590,7 @@ compute_branch_probabilities (unsigned cfg_checksum, unsigned lineno_checksum)
changes = 0;
FOR_BB_BETWEEN (bb, EXIT_BLOCK_PTR_FOR_FN (cfun), NULL, prev_bb)
{
struct bb_info *bi = BB_INFO (bb);
struct bb_profile_info *bi = BB_INFO (bb);
if (! bi->count_valid)
{
if (bi->succ_count == 0)
......@@ -1129,7 +1129,7 @@ branch_prob (void)
el = create_edge_list ();
num_edges = NUM_EDGES (el);
alloc_aux_for_edges (sizeof (struct edge_info));
alloc_aux_for_edges (sizeof (struct edge_profile_info));
/* The basic blocks are expected to be numbered sequentially. */
compact_blocks ();
......@@ -1161,7 +1161,7 @@ branch_prob (void)
for (num_instrumented = i = 0; i < num_edges; i++)
{
edge e = INDEX_EDGE (el, i);
struct edge_info *inf = EDGE_INFO (e);
struct edge_profile_info *inf = EDGE_INFO (e);
if (inf->ignore || inf->on_tree)
/*NOP*/;
......@@ -1221,7 +1221,7 @@ branch_prob (void)
FOR_EACH_EDGE (e, ei, bb->succs)
{
struct edge_info *i = EDGE_INFO (e);
struct edge_profile_info *i = EDGE_INFO (e);
if (!i->ignore)
{
unsigned flag_bits = 0;
......
gcc/tree-ssa-loop-im.c
......@@ -116,7 +116,7 @@ typedef struct mem_ref_loc
/* Description of a memory reference. */
typedef struct mem_ref
typedef struct im_mem_ref
{
unsigned id; /* ID assigned to the memory reference
(its index in memory_accesses.refs_list) */
......@@ -153,15 +153,15 @@ typedef struct mem_ref
/* Mem_ref hashtable helpers. */
struct mem_ref_hasher : typed_noop_remove <mem_ref>
struct mem_ref_hasher : typed_noop_remove <im_mem_ref>
{
typedef mem_ref value_type;
typedef im_mem_ref value_type;
typedef tree_node compare_type;
static inline hashval_t hash (const value_type *);
static inline bool equal (const value_type *, const compare_type *);
};
/* A hash function for struct mem_ref object OBJ. */
/* A hash function for struct im_mem_ref object OBJ. */
inline hashval_t
mem_ref_hasher::hash (const value_type *mem)
......@@ -169,7 +169,7 @@ mem_ref_hasher::hash (const value_type *mem)
return mem->hash;
}
/* An equality function for struct mem_ref object MEM1 with
/* An equality function for struct im_mem_ref object MEM1 with
memory reference OBJ2. */
inline bool
......@@ -1395,7 +1395,7 @@ force_move_till (tree ref, tree *index, void *data)
/* A function to free the mem_ref object OBJ. */
static void
memref_free (struct mem_ref *mem)
memref_free (struct im_mem_ref *mem)
{
mem->accesses_in_loop.release ();
}
......@@ -1406,7 +1406,7 @@ memref_free (struct mem_ref *mem)
static mem_ref_p
mem_ref_alloc (tree mem, unsigned hash, unsigned id)
{
mem_ref_p ref = XOBNEW (&mem_ref_obstack, struct mem_ref);
mem_ref_p ref = XOBNEW (&mem_ref_obstack, struct im_mem_ref);
ao_ref_init (&ref->mem, mem);
ref->id = id;
ref->hash = hash;
......@@ -1461,7 +1461,7 @@ gather_mem_refs_stmt (struct loop *loop, gimple stmt)
{
tree *mem = NULL;
hashval_t hash;
mem_ref **slot;
im_mem_ref **slot;
mem_ref_p ref;
bool is_stored;
unsigned id;
......@@ -1578,7 +1578,7 @@ analyze_memory_references (void)
/* Sort the location list of gathered memory references after their
loop postorder number. */
mem_ref *ref;
im_mem_ref *ref;
FOR_EACH_VEC_ELT (memory_accesses.refs_list, i, ref)
ref->accesses_in_loop.qsort (sort_locs_in_loop_postorder_cmp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment