int x, num_part, num;
tree var;
var_ann_t ann;
-
+
num = 0;
num_part = num_var_partitions (map);
}
-/* This function will combine the partitions in MAP for VAR1 and VAR2. It
- Returns the partition which represents the new partition. If the two
+/* This function will combine the partitions in MAP for VAR1 and VAR2. It
+ Returns the partition which represents the new partition. If the two
partitions cannot be combined, NO_PARTITION is returned. */
int
gcc_assert (TREE_CODE (var1) == SSA_NAME);
gcc_assert (TREE_CODE (var2) == SSA_NAME);
- /* This is independent of partition_to_view. If partition_to_view is
+ /* This is independent of partition_to_view. If partition_to_view is
on, then whichever one of these partitions is absorbed will never have a
dereference into the partition_to_view array any more. */
return p3;
}
-
-/* Compress the partition numbers in MAP such that they fall in the range
+
+/* Compress the partition numbers in MAP such that they fall in the range
0..(num_partitions-1) instead of wherever they turned out during
the partitioning exercise. This removes any references to unused
partitions, thereby allowing bitmaps and other vectors to be much
- denser.
+ denser.
This is implemented such that compaction doesn't affect partitioning.
Ie., once partitions are created and possibly merged, running one
definitions for assignment to program variables. */
-/* Set MAP back to the initial state of having no partition view. Return a
- bitmap which has a bit set for each partition number which is in use in the
+/* Set MAP back to the initial state of having no partition view. Return a
+ bitmap which has a bit set for each partition number which is in use in the
varmap. */
static bitmap
/* This routine will finalize the view data for MAP based on the partitions
- set in SELECTED. This is either the same bitmap returned from
+ set in SELECTED. This is either the same bitmap returned from
partition_view_init, or a trimmed down version if some of those partitions
were not desired in this view. SELECTED is freed before returning. */
-static void
+static void
partition_view_fini (var_map map, bitmap selected)
{
bitmap_iterator bi;
}
-/* Create a partition view which includes all the used partitions in MAP. If
+/* Create a partition view which includes all the used partitions in MAP. If
WANT_BASES is true, create the base variable map as well. */
extern void
}
-/* Create a partition view in MAP which includes just partitions which occur in
- the bitmap ONLY. If WANT_BASES is true, create the base variable map
+/* Create a partition view in MAP which includes just partitions which occur in
+ the bitmap ONLY. If WANT_BASES is true, create the base variable map
as well. */
extern void
}
/* Look if the block is dead (by possibly eliminating its dead subblocks)
- and return true if so.
+ and return true if so.
Block is declared dead if:
1) No statements are associated with it.
2) Declares no live variables
/* Debug info of nested function refers to the block of the
function. We might stil call it even if all statements
of function it was nested into was elliminated.
-
+
TODO: We can actually look into cgraph to see if function
will be output to file. */
if (TREE_CODE (*t) == FUNCTION_DECL)
unused = false;
+
+ /* If a decl has a value expr, we need to instantiate it
+ regardless of debug info generation, to avoid codegen
+ differences in memory overlap tests. update_equiv_regs() may
+ indirectly call validate_equiv_mem() to test whether a
+ SET_DEST overlaps with others, and if the value expr changes
+ by virtual register instantiation, we may get end up with
+ different results. */
+ else if (TREE_CODE (*t) == VAR_DECL && DECL_HAS_VALUE_EXPR_P (*t))
+ unused = false;
+
/* Remove everything we don't generate debug info for. */
else if (DECL_IGNORED_P (*t))
{
/* When we are not doing full debug info, we however can keep around
only the used variables for cfgexpand's memory packing saving quite
- a lot of memory.
+ a lot of memory.
For sake of -g3, we keep around those vars but we don't count this as
use of block, so innermost block with no used vars and no instructions
can be considered dead. We only want to keep around blocks user can
- breakpoint into and ask about value of optimized out variables.
+ breakpoint into and ask about value of optimized out variables.
Similarly we need to keep around types at least until all variables of
all nested blocks are gone. We track no information on whether given
type is used or not. */
else if (debug_info_level == DINFO_LEVEL_NORMAL
- || debug_info_level == DINFO_LEVEL_VERBOSE
- /* Removing declarations before inlining is going to affect
- DECL_UID that in turn is going to affect hashtables and
- code generation. */
- || !cfun->after_inlining)
+ || debug_info_level == DINFO_LEVEL_VERBOSE)
;
else
{
eliminated. */
else if (!nsubblocks)
;
- /* If there are live subblocks and we still have some unused variables
- or types declared, we must keep them.
- Before inliing we must not depend on debug info verbosity to keep
- DECL_UIDs stable. */
- else if (!cfun->after_inlining && BLOCK_VARS (scope))
- unused = false;
/* For terse debug info we can eliminate info on unused variables. */
else if (debug_info_level == DINFO_LEVEL_NONE
|| debug_info_level == DINFO_LEVEL_TERSE)
- ;
+ {
+ /* Even for -g0/-g1 don't prune outer scopes from artificial
+ functions, otherwise diagnostics using tree_nonartificial_location
+ will not be emitted properly. */
+ if (inlined_function_outer_scope_p (scope))
+ {
+ tree ao = scope;
+
+ while (ao
+ && TREE_CODE (ao) == BLOCK
+ && BLOCK_ABSTRACT_ORIGIN (ao) != ao)
+ ao = BLOCK_ABSTRACT_ORIGIN (ao);
+ if (ao
+ && TREE_CODE (ao) == FUNCTION_DECL
+ && DECL_DECLARED_INLINE_P (ao)
+ && lookup_attribute ("artificial", DECL_ATTRIBUTES (ao)))
+ unused = false;
+ }
+ }
else if (BLOCK_VARS (scope) || BLOCK_NUM_NONLOCALIZED_VARS (scope))
unused = false;
/* See if this block is important for representation of inlined function.
return unused;
}
-/* Mark all VAR_DECLS under *EXPR_P as used, so that they won't be
+/* Mark all VAR_DECLS under *EXPR_P as used, so that they won't be
eliminated during the tree->rtl conversion process. */
static inline void
fprintf (file, "\n%*s}\n",indent, "");
}
+/* Dump the tree of lexical scopes starting at SCOPE to stderr. FLAGS
+ is as in print_generic_expr. */
+
+void
+debug_scope_block (tree scope, int flags)
+{
+ dump_scope_block (stderr, 0, scope, flags);
+}
+
/* Dump the tree of lexical scopes of current_function_decl to FILE.
FLAGS is as in print_generic_expr. */
var_ann_t ann;
bitmap global_unused_vars = NULL;
+ /* Removing declarations from lexical blocks when not optimizing is
+ not only a waste of time, it actually causes differences in stack
+ layout. */
+ if (!optimize)
+ return;
+
mark_scope_block_unused (DECL_INITIAL (current_function_decl));
/* Assume all locals are unused. */
gimple stmt = gsi_stmt (gsi);
tree b = gimple_block (stmt);
+ if (is_gimple_debug (stmt))
+ continue;
+
if (b)
TREE_USED (b) = true;
if (TREE_CODE (var) != FUNCTION_DECL
&& (!(ann = var_ann (var))
- || !ann->used)
- && (optimize || DECL_ARTIFICIAL (var)))
+ || !ann->used))
{
if (is_global_var (var))
{
&& TREE_CODE (t) != PARM_DECL
&& TREE_CODE (t) != RESULT_DECL
&& !(ann = var_ann (t))->used
- && !TREE_ADDRESSABLE (t)
- && (optimize || DECL_ARTIFICIAL (t)))
+ && !ann->is_heapvar
+ && !TREE_ADDRESSABLE (t))
remove_referenced_var (t);
remove_unused_scope_block_p (DECL_INITIAL (current_function_decl));
if (dump_file && (dump_flags & TDF_DETAILS))
/* Free storage for live range info object LIVE. */
-void
+void
delete_tree_live_info (tree_live_info_p live)
{
int x;
}
-/* Visit basic block BB and propagate any required live on entry bits from
- LIVE into the predecessors. VISITED is the bitmap of visited blocks.
+/* Visit basic block BB and propagate any required live on entry bits from
+ LIVE into the predecessors. VISITED is the bitmap of visited blocks.
TMP is a temporary work bitmap which is passed in to avoid reallocating
it each time. */
-static void
+static void
loe_visit_block (tree_live_info_p live, basic_block bb, sbitmap visited,
bitmap tmp)
{
if (pred_bb == ENTRY_BLOCK_PTR)
continue;
/* TMP is variables live-on-entry from BB that aren't defined in the
- predecessor block. This should be the live on entry vars to pred.
+ predecessor block. This should be the live on entry vars to pred.
Note that liveout is the DEFs in a block while live on entry is
being calculated. */
bitmap_and_compl (tmp, loe, live->liveout[pred_bb->index]);
- /* Add these bits to live-on-entry for the pred. if there are any
+ /* Add these bits to live-on-entry for the pred. if there are any
changes, and pred_bb has been visited already, add it to the
revisit stack. */
change = bitmap_ior_into (live_on_entry (live, pred_bb), tmp);
}
-/* Using LIVE, fill in all the live-on-entry blocks between the defs and uses
+/* Using LIVE, fill in all the live-on-entry blocks between the defs and uses
of all the variables. */
static void
add_block = e->src;
}
}
+ else if (is_gimple_debug (use_stmt))
+ continue;
else
{
/* If its not defined in this block, its live on entry. */
basic_block use_bb = gimple_bb (use_stmt);
if (use_bb != def_bb)
add_block = use_bb;
- }
+ }
/* If there was a live on entry use, set the bit. */
if (add_block)
{
gimple phi = gsi_stmt (gsi);
for (i = 0; i < gimple_phi_num_args (phi); i++)
- {
+ {
tree t = PHI_ARG_DEF (phi, i);
int p;
}
-/* Given partition map MAP, calculate all the live on entry bitmaps for
+/* Given partition map MAP, calculate all the live on entry bitmaps for
each partition. Return a new live info object. */
-tree_live_info_p
+tree_live_info_p
calculate_live_ranges (var_map map)
{
tree var;
fprintf (stderr, " in BB%d, ", tmp->index);
fprintf (stderr, "by:\n");
print_gimple_stmt (stderr, stmt, 0, TDF_SLIM);
- fprintf (stderr, "\nIt is also live-on-entry to entry BB %d",
+ fprintf (stderr, "\nIt is also live-on-entry to entry BB %d",
entry_block);
fprintf (stderr, " So it appears to have multiple defs.\n");
}
else
if (d == var)
{
- /* The only way this var shouldn't be marked live on entry is
+ /* The only way this var shouldn't be marked live on entry is
if it occurs in a PHI argument of the block. */
size_t z;
bool ok = false;
continue;
num++;
print_generic_expr (stderr, var, TDF_SLIM);
- fprintf (stderr, " is not marked live-on-entry to entry BB%d ",
+ fprintf (stderr, " is not marked live-on-entry to entry BB%d ",
entry_block);
fprintf (stderr, "but it is a default def so it should be.\n");
}
OSDN Git Service
