From 60ad452f741bf48a38ef41f753e0f7ea56a73c02 Mon Sep 17 00:00:00 2001 From: dnovillo Date: Wed, 15 Aug 2007 17:37:33 +0000 Subject: [PATCH] * tree-ssa-alias.c (compute_memory_partitions): Use alias_bitmap_obstack to allocate bitmaps. (reset_alias_info): Factor out of init_alias_info. Mark all name tags not associated to an SSA name for renaming. (init_alias_info): Call it. (create_name_tags): Tidy. Add comments. (dump_points_to_info_for): Do not call get_mem_sym_stats_for. testsuite/ChangeLog gcc.dg/tree-ssa/20070815.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127520 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 10 ++ gcc/testsuite/ChangeLog | 4 + gcc/testsuite/gcc.dg/tree-ssa/20070815.c | 60 +++++++++++ gcc/tree-ssa-alias.c | 172 ++++++++++++++++++------------- 4 files changed, 177 insertions(+), 69 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/20070815.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2926b8d..f7e3103 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2007-08-15 Diego Novillo + + * tree-ssa-alias.c (compute_memory_partitions): Use + alias_bitmap_obstack to allocate bitmaps. + (reset_alias_info): Factor out of init_alias_info. + Mark all name tags not associated to an SSA name for renaming. + (init_alias_info): Call it. + (create_name_tags): Tidy. Add comments. + (dump_points_to_info_for): Do not call get_mem_sym_stats_for. + 2007-08-15 Maxim Kuvyrkov * config/mips/mips.c (vr4130_swap_insns_p): Use new interface to diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bde9f73..5515a9c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-08-15 Diego Novillo + + gcc.dg/tree-ssa/20070815.c: New test. + 2007-08-15 Francois-Xavier Coudert PR fortran/33077 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20070815.c b/gcc/testsuite/gcc.dg/tree-ssa/20070815.c new file mode 100644 index 0000000..fa0e69f --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/20070815.c @@ -0,0 +1,60 @@ +/* { dg-do compile } */ +/* { dg-options "-O -w" } */ + +/* This code snippet from glibc 2.3.5 was causing an ICE during + optimization because we were failing to update the SSA form for + stale name tags. These are tags that are associated with SSA pointers + that have been removed from the IL. This was causing the SSA + verifier to fail before we had a chance to run the cleanup pass that + finally removes all the remaining PHI nodes for the stale name tag. */ +struct _IO_wide_data +{ +}; +struct _IO_FILE { +}; +typedef struct _IO_FILE _IO_FILE; +struct _IO_jump_t +{ +}; +struct _IO_FILE_plus +{ + _IO_FILE file; +}; +extern const struct _IO_jump_t _IO_file_jumps_maybe_mmap ; +extern const struct _IO_jump_t _IO_wfile_jumps; +extern const struct _IO_jump_t _IO_wfile_jumps_maybe_mmap ; + +_IO_new_fdopen (fd, mode) + const char *mode; +{ + int read_write; + int posix_mode = 0; + struct locked_FILE + { + struct _IO_FILE_plus fp; + struct _IO_wide_data wd; + } *new_f; + int fd_flags; + int use_mmap = 0; + { + } + { + switch (*++mode) + { + case '\0': + use_mmap = 1; + } + } + if (((fd_flags & 0003) == 00 && !(read_write & 8)) + || ((fd_flags & 0003) == 01 && !(read_write & 4))) + { + } + if ((posix_mode & 02000) && !(fd_flags & 02000)) + return ((void *)0); + _IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd, + (use_mmap && (read_write & 8)) + ? &_IO_wfile_jumps_maybe_mmap : + &_IO_wfile_jumps); + (use_mmap && (read_write & 8)) ? &_IO_file_jumps_maybe_mmap : + _IO_file_init (&new_f->fp); +} diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index 3889ea5..3a490fc 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -1497,7 +1497,7 @@ compute_memory_partitions (void) virtual operands. However, by reducing the size of the alias sets to be scanned, the work needed inside the operand scanner is significantly reduced. */ - new_aliases = BITMAP_ALLOC (NULL); + new_aliases = BITMAP_ALLOC (&alias_bitmap_obstack); for (i = 0; VEC_iterate (tree, tags, i, tag); i++) { @@ -1891,6 +1891,103 @@ init_mem_ref_stats (void) } +/* Helper for init_alias_info. Reset existing aliasing information. */ + +static void +reset_alias_info (void) +{ + referenced_var_iterator rvi; + tree var; + unsigned i; + bitmap active_nmts, all_nmts; + + /* Clear the set of addressable variables. We do not need to clear + the TREE_ADDRESSABLE bit on every symbol because we are going to + re-compute addressability here. */ + bitmap_clear (gimple_addressable_vars (cfun)); + + active_nmts = BITMAP_ALLOC (&alias_bitmap_obstack); + all_nmts = BITMAP_ALLOC (&alias_bitmap_obstack); + + /* Clear flow-insensitive alias information from each symbol. */ + FOR_EACH_REFERENCED_VAR (var, rvi) + { + if (is_gimple_reg (var)) + continue; + + if (MTAG_P (var)) + MTAG_ALIASES (var) = NULL; + + /* Memory partition information will be computed from scratch. */ + if (TREE_CODE (var) == MEMORY_PARTITION_TAG) + MPT_SYMBOLS (var) = NULL; + + /* Collect all the name tags to determine if we have any + orphaned that need to be removed from the IL. A name tag + will be orphaned if it is not associated with any active SSA + name. */ + if (TREE_CODE (var) == NAME_MEMORY_TAG) + bitmap_set_bit (all_nmts, DECL_UID (var)); + + /* Since we are about to re-discover call-clobbered + variables, clear the call-clobbered flag. Variables that + are intrinsically call-clobbered (globals, local statics, + etc) will not be marked by the aliasing code, so we can't + remove them from CALL_CLOBBERED_VARS. + + NB: STRUCT_FIELDS are still call clobbered if they are for a + global variable, so we *don't* clear their call clobberedness + just because they are tags, though we will clear it if they + aren't for global variables. */ + if (TREE_CODE (var) == NAME_MEMORY_TAG + || TREE_CODE (var) == SYMBOL_MEMORY_TAG + || TREE_CODE (var) == MEMORY_PARTITION_TAG + || !is_global_var (var)) + clear_call_clobbered (var); + } + + /* Clear flow-sensitive points-to information from each SSA name. */ + for (i = 1; i < num_ssa_names; i++) + { + tree name = ssa_name (i); + + if (!name || !POINTER_TYPE_P (TREE_TYPE (name))) + continue; + + if (SSA_NAME_PTR_INFO (name)) + { + struct ptr_info_def *pi = SSA_NAME_PTR_INFO (name); + + /* Clear all the flags but keep the name tag to + avoid creating new temporaries unnecessarily. If + this pointer is found to point to a subset or + superset of its former points-to set, then a new + tag will need to be created in create_name_tags. */ + pi->pt_anything = 0; + pi->pt_null = 0; + pi->value_escapes_p = 0; + pi->is_dereferenced = 0; + if (pi->pt_vars) + bitmap_clear (pi->pt_vars); + + /* Add NAME's name tag to the set of active tags. */ + if (pi->name_mem_tag) + bitmap_set_bit (active_nmts, DECL_UID (pi->name_mem_tag)); + } + } + + /* Name memory tags that are no longer associated with an SSA name + are considered stale and should be removed from the IL. All the + name tags that are in the set ALL_NMTS but not in ACTIVE_NMTS are + considered stale and marked for renaming. */ + bitmap_and_compl_into (all_nmts, active_nmts); + mark_set_for_renaming (all_nmts); + + BITMAP_FREE (all_nmts); + BITMAP_FREE (active_nmts); +} + + /* Initialize the data structures used for alias analysis. */ static struct alias_info * @@ -1913,70 +2010,7 @@ init_alias_info (void) /* If aliases have been computed before, clear existing information. */ if (gimple_aliases_computed_p (cfun)) - { - unsigned i; - - /* Similarly, clear the set of addressable variables. In this - case, we can just clear the set because addressability is - only computed here. */ - bitmap_clear (gimple_addressable_vars (cfun)); - - /* Clear flow-insensitive alias information from each symbol. */ - FOR_EACH_REFERENCED_VAR (var, rvi) - { - if (is_gimple_reg (var)) - continue; - - if (MTAG_P (var)) - MTAG_ALIASES (var) = NULL; - - /* Memory partition information will be computed from scratch. */ - if (TREE_CODE (var) == MEMORY_PARTITION_TAG) - MPT_SYMBOLS (var) = NULL; - - /* Since we are about to re-discover call-clobbered - variables, clear the call-clobbered flag. Variables that - are intrinsically call-clobbered (globals, local statics, - etc) will not be marked by the aliasing code, so we can't - remove them from CALL_CLOBBERED_VARS. - - NB: STRUCT_FIELDS are still call clobbered if they are - for a global variable, so we *don't* clear their call - clobberedness just because they are tags, though we will - clear it if they aren't for global variables. */ - if (TREE_CODE (var) == NAME_MEMORY_TAG - || TREE_CODE (var) == SYMBOL_MEMORY_TAG - || TREE_CODE (var) == MEMORY_PARTITION_TAG - || !is_global_var (var)) - clear_call_clobbered (var); - } - - /* Clear flow-sensitive points-to information from each SSA name. */ - for (i = 1; i < num_ssa_names; i++) - { - tree name = ssa_name (i); - - if (!name || !POINTER_TYPE_P (TREE_TYPE (name))) - continue; - - if (SSA_NAME_PTR_INFO (name)) - { - struct ptr_info_def *pi = SSA_NAME_PTR_INFO (name); - - /* Clear all the flags but keep the name tag to - avoid creating new temporaries unnecessarily. If - this pointer is found to point to a subset or - superset of its former points-to set, then a new - tag will need to be created in create_name_tags. */ - pi->pt_anything = 0; - pi->pt_null = 0; - pi->value_escapes_p = 0; - pi->is_dereferenced = 0; - if (pi->pt_vars) - bitmap_clear (pi->pt_vars); - } - } - } + reset_alias_info (); else { /* If this is the first time we compute aliasing information, @@ -2123,6 +2157,7 @@ create_name_tags (void) else { *slot = pi; + /* If we didn't find a pointer with the same points-to set as PTR, create a new name tag if needed. */ if (pi->name_mem_tag == NULL_TREE) @@ -2135,7 +2170,8 @@ create_name_tags (void) renaming. */ if (old_name_tag && old_name_tag != pi->name_mem_tag) mark_sym_for_renaming (old_name_tag); - + + /* Inherit volatility from the pointed-to type. */ TREE_THIS_VOLATILE (pi->name_mem_tag) |= TREE_THIS_VOLATILE (TREE_TYPE (TREE_TYPE (ptr))); @@ -3215,9 +3251,7 @@ dump_points_to_info_for (FILE *file, tree ptr) } if (pi->is_dereferenced) - fprintf (file, ", is dereferenced (R=%ld, W=%ld)", - get_mem_sym_stats_for (ptr)->num_direct_reads, - get_mem_sym_stats_for (ptr)->num_direct_writes); + fprintf (file, ", is dereferenced"); if (pi->value_escapes_p) fprintf (file, ", its value escapes"); -- 2.7.4