From: Mark Mitchell <mark@codesourcery.com>
Date: Thu, 23 Dec 2004 21:55:12 +0000 (+0000)
Subject: gimplify.c (gimplify_modify_expr_rhs): Use types_compatible_p.
X-Git-Tag: releases/gcc-4.0.0~1960
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=058e32b336f75d77847ecdd938cb30ff493b9018;p=thirdparty%2Fgcc.git

gimplify.c (gimplify_modify_expr_rhs): Use types_compatible_p.

	* gimplify.c (gimplify_modify_expr_rhs): Use types_compatible_p.

	* g++.dg/opt/temp1.C: Make memcpy actually copy bytes.

From-SVN: r92571
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f8e174b30da..c84ae79e5860 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-23  Mark Mitchell  <mark@codesourcery.com>
+
+	* gimplify.c (gimplify_modify_expr_rhs): Use types_compatible_p.
+
 2004-12-23  DJ Delorie  <dj@redhat.com>
 
 	* genrecog.c (did_you_mean_codes): New.
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 0f610e4d2424..9bf4c4ec6a98 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -2817,8 +2817,9 @@ gimplify_modify_expr_rhs (tree *expr_p, tree *from_p, tree *to_p, tree *pre_p,
 	  pointer = TREE_OPERAND (*from_p, 0);
 	  STRIP_NOPS (pointer);
 	  if (TREE_CODE (pointer) == ADDR_EXPR
-	      && (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (pointer, 0)))
-		  == TYPE_MAIN_VARIANT (TREE_TYPE (*from_p))))
+	      && (lang_hooks.types_compatible_p 
+		  (TREE_TYPE (TREE_OPERAND (pointer, 0)),
+		   TREE_TYPE (*from_p))))
 	    {
 	      *from_p = TREE_OPERAND (pointer, 0); 
 	      ret = GS_OK;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 518cf3dea6aa..e3e6ae7033cb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-23  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.dg/opt/temp1.C: Make memcpy actually copy bytes.
+
 2004-12-23  Alexandre Oliva  <aoliva@redhat.com>
 
 	* gcc.dg/empty2.c: Add missing dg-warning.
diff --git a/gcc/testsuite/g++.dg/opt/temp1.C b/gcc/testsuite/g++.dg/opt/temp1.C
index 6454cdb50356..05dd2697171a 100644
--- a/gcc/testsuite/g++.dg/opt/temp1.C
+++ b/gcc/testsuite/g++.dg/opt/temp1.C
@@ -15,6 +15,10 @@ int i;
 extern "C"
 void *memcpy (void *dest, const void *src, __SIZE_TYPE__ n)
 {
+  char *d = (char *) dest;
+  const char *s = (const char *) src;
+  while (n--)
+    d[n] = s[n];
   ++i;
 }