From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Mon, 5 Sep 2011 19:38:20 +0000 (+0000)
Subject: mips.c (mips_gimplify_va_arg_expr): Unshare off.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ab9ec7b7fa55245a78720a49e9284fd64d04536;p=gcc.git

mips.c (mips_gimplify_va_arg_expr): Unshare off.

gcc/
	* config/mips/mips.c (mips_gimplify_va_arg_expr): Unshare off.
	Fix the type of the BIT_AND_EXPR.

From-SVN: r178556
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8c98724e54..08dd4a4c04b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-05  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/mips/mips.c (mips_gimplify_va_arg_expr): Unshare off.
+	Fix the type of the BIT_AND_EXPR.
+
 2011-09-05  David S. Miller  <davem@davemloft.net>
 
 	* config.host: Add driver-sparc.o and sparc/x-sparc on
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index f5c4cbe60f6..a5d1eedc910 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -5601,7 +5601,7 @@ mips_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p,
 	}
 
       /* [2] Emit code to branch if off == 0.  */
-      t = build2 (NE_EXPR, boolean_type_node, off,
+      t = build2 (NE_EXPR, boolean_type_node, unshare_expr (off),
 		  build_int_cst (TREE_TYPE (off), 0));
       addr = build3 (COND_EXPR, ptr_type_node, t, NULL_TREE, NULL_TREE);
 
@@ -5624,7 +5624,7 @@ mips_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p,
 	  /* [9] Emit: ovfl = ((intptr_t) ovfl + osize - 1) & -osize.  */
 	  t = fold_build_pointer_plus_hwi (unshare_expr (ovfl), osize - 1);
 	  u = build_int_cst (TREE_TYPE (t), -osize);
-	  t = build2 (BIT_AND_EXPR, sizetype, t, u);
+	  t = build2 (BIT_AND_EXPR, TREE_TYPE (t), t, u);
 	  align = build2 (MODIFY_EXPR, TREE_TYPE (ovfl),
 			  unshare_expr (ovfl), t);
 	}