re PR middle-end/28724 (atomic produces type mismatches)

	PR middle-end/28724
	* gimplify.c (gimplify_omp_atomic_pipeline): Convert oldival
	to itype in assignment to oldival2.

From-SVN: r116153

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3706f53..1da5d55 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-15  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/28724
+       * gimplify.c (gimplify_omp_atomic_pipeline): Convert oldival
+       to itype in assignment to oldival2.
+
 2006-07-14  Andrew Pinski  <pinksia@physics.uc.edu>
 
        PR c/27490

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 16e4d3c..e2586a0 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -5129,7 +5129,8 @@ gimplify_omp_atomic_pipeline (tree *expr_p, tree *pre_p, tree addr,
       gimplify_and_add (x, pre_p);
     }
 
-  x = build2 (MODIFY_EXPR, void_type_node, oldival2, oldival);
+  x = build2 (MODIFY_EXPR, void_type_node, oldival2,
+             fold_convert (itype, oldival));
   gimplify_and_add (x, pre_p);
 
   args = tree_cons (NULL, fold_convert (itype, newival), NULL);