This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH]: Fix ada problems from recalculate_used_aloe (Was Re: [PATCH]: Reduce memory usage and compile time necessary for pruning)
Since the patch i sent you survived bootstrap and regtest on my system,
and you said it seems to build Ada okay, I am committing this.
Richard Guenther was kind enough to do some memory and compile time
testing on it and it doesn't seem to cause any problems.
Sincere apologies for the delay,
> Our policy is to test stock FSF mainline, not a patched version.
>
Index: ChangeLog
===================================================================
--- ChangeLog (revision 112814)
+++ ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2006-04-10 Daniel Berlin <dberlin@dberlin.org>
+
+ * tree-ssa-alias.c (lhs_may_store_to): New function.
+ (recalculate_used_alone): Handle LHS of calls.
+
2006-04-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
PR target/27034
Index: tree-ssa-alias.c
===================================================================
--- tree-ssa-alias.c (revision 112801)
+++ tree-ssa-alias.c (working copy)
@@ -426,6 +426,26 @@ compute_call_clobbered (struct alias_inf
}
+/* Helper for recalculate_used_alone. Return a conservatively correct
+ answer as to whether STMT may make a store on the LHS to SYM. */
+
+static bool
+lhs_may_store_to (tree stmt, tree sym ATTRIBUTE_UNUSED)
+{
+ tree lhs = TREE_OPERAND (stmt, 0);
+
+ lhs = get_base_address (lhs);
+
+ if (!lhs)
+ return false;
+
+ if (TREE_CODE (lhs) == SSA_NAME)
+ return false;
+ /* We could do better here by looking at the type tag of LHS, but it
+ is unclear whether this is worth it. */
+ return true;
+}
+
/* Recalculate the used_alone information for SMTs . */
void
@@ -457,38 +477,45 @@ recalculate_used_alone (void)
{
for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
{
+ bool iscall = false;
+ ssa_op_iter iter;
+
stmt = bsi_stmt (bsi);
+
if (TREE_CODE (stmt) == CALL_EXPR
|| (TREE_CODE (stmt) == MODIFY_EXPR
&& TREE_CODE (TREE_OPERAND (stmt, 1)) == CALL_EXPR))
- VEC_safe_push (tree, heap, calls, stmt);
- else
{
- ssa_op_iter iter;
+ iscall = true;
+ VEC_safe_push (tree, heap, calls, stmt);
+ }
+
+ FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter,
+ SSA_OP_VUSE | SSA_OP_VIRTUAL_DEFS)
+ {
+ tree svar = var;
+
+ if (TREE_CODE (var) == SSA_NAME)
+ svar = SSA_NAME_VAR (var);
- FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter,
- SSA_OP_VUSE | SSA_OP_VIRTUAL_DEFS)
+ if (TREE_CODE (svar) == SYMBOL_MEMORY_TAG)
{
- tree svar = var;
-
- if(TREE_CODE (var) == SSA_NAME)
- svar = SSA_NAME_VAR (var);
-
- if (TREE_CODE (svar) == SYMBOL_MEMORY_TAG)
+ /* We only care about the LHS on calls. */
+ if (iscall && !lhs_may_store_to (stmt, svar))
+ continue;
+
+ if (!SMT_USED_ALONE (svar))
{
- if (!SMT_USED_ALONE (svar))
- {
- SMT_USED_ALONE (svar) = true;
-
- /* Only need to mark for renaming if it wasn't
- used alone before. */
- if (!SMT_OLD_USED_ALONE (svar))
- mark_sym_for_renaming (svar);
- }
+ SMT_USED_ALONE (svar) = true;
+
+ /* Only need to mark for renaming if it wasn't
+ used alone before. */
+ if (!SMT_OLD_USED_ALONE (svar))
+ mark_sym_for_renaming (svar);
}
}
- }
- }
+ }
+ }
}
/* Update the operands on all the calls we saw. */