aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-09-24 18:16:11 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-09-24 18:16:11 +0000
commitab5a7d5536558eec88d4f6c8096381c8cb1efbbc (patch)
tree59fd370949d9651a684e75d418d9278f2730b049
parente4f42b5b00b47222a1653b2ca1edb35ec40aa53d (diff)
2004-09-24 Andrew Pinski <pinskia@physics.uc.edu>merge-HEAD-csl-sol210-1
* tree-ssa-phiopt.c (conditional_replacement): Use the correct type with the copy of the conditional. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88065 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-ssa-phiopt.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e237dc163d..74b4a425f54 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2004-09-24 Andrew Pinski <pinskia@physics.uc.edu>
+ * tree-ssa-phiopt.c (conditional_replacement): Use the correct
+ type with the copy of the conditional.
+
+2004-09-24 Andrew Pinski <pinskia@physics.uc.edu>
+
PR tree-opt/16954
* tree-ssa-copyrename.c (copy_rename_partition_coalesce):
Prevent renaming if the aliasing sets of the type which the
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index fe0fddf9345..e61e736f5a3 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -344,11 +344,11 @@ conditional_replacement (basic_block bb, tree phi, tree arg0, tree arg1)
if (!COMPARISON_CLASS_P (old_result))
return false;
- new1 = build (TREE_CODE (old_result), TREE_TYPE (result),
+ new1 = build (TREE_CODE (old_result), TREE_TYPE (old_result),
TREE_OPERAND (old_result, 0),
TREE_OPERAND (old_result, 1));
- new1 = build (MODIFY_EXPR, TREE_TYPE (result), new_var, new1);
+ new1 = build (MODIFY_EXPR, TREE_TYPE (old_result), new_var, new1);
bsi_insert_after (&bsi, new1, BSI_NEW_STMT);
}