From d0f53cbc80c79f9a296ca7fb2c9b6c2f5ba9bb44 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 15 Aug 2006 16:56:28 +0200 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/gimplify.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3706f53eb34..1da5d559fb1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-08-15 Jakub Jelinek + + PR middle-end/28724 + * gimplify.c (gimplify_omp_atomic_pipeline): Convert oldival + to itype in assignment to oldival2. + 2006-07-14 Andrew Pinski PR c/27490 diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 16e4d3c6e07..e2586a0f822 100644 --- 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);