emit-rtl.c (set_mem_attributes_minus_bitpos): Treat complex types as aggregates not scalars.

	* emit-rtl.c (set_mem_attributes_minus_bitpos): Treat complex
	types as aggregates not scalars.
	* function.c (assign_stack_temp_for_type): Likewise.

testsuite:
	* gcc.dg/torture/complex-alias-1.c: New test.

From-SVN: r121968

5 files changed, 46 insertions, 3 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3570907..01528f2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-14  Joseph Myers  <joseph@codesourcery.com>
+
+	* emit-rtl.c (set_mem_attributes_minus_bitpos): Treat complex
+	types as aggregates not scalars.
+	* function.c (assign_stack_temp_for_type): Likewise.
+
 2007-02-14  Roger Sayle  <roger@eyesopen.com>
 	    Zdenek Dvorak  <dvorakz@suse.cz>
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 1faa57f..9a5db43 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -1481,12 +1481,15 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp,
   alias = get_alias_set (t);
 
   MEM_VOLATILE_P (ref) |= TYPE_VOLATILE (type);
-  MEM_IN_STRUCT_P (ref) = AGGREGATE_TYPE_P (type);
+  MEM_IN_STRUCT_P (ref)
+    = AGGREGATE_TYPE_P (type) || TREE_CODE (type) == COMPLEX_TYPE;
   MEM_POINTER (ref) = POINTER_TYPE_P (type);
 
   /* If we are making an object of this type, or if this is a DECL, we know
      that it is a scalar if the type is not an aggregate.  */
-  if ((objectp || DECL_P (t)) && ! AGGREGATE_TYPE_P (type))
+  if ((objectp || DECL_P (t))
+      && ! AGGREGATE_TYPE_P (type)
+      && TREE_CODE (type) != COMPLEX_TYPE)
     MEM_SCALAR_P (ref) = 1;
 
   /* We can set the alignment from the type if we are making an object,
diff --git a/gcc/function.c b/gcc/function.c
index 31958b1..b667a17 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -763,7 +763,8 @@ assign_stack_temp_for_type (enum machine_mode mode, HOST_WIDE_INT size,
   if (type != 0)
     {
       MEM_VOLATILE_P (slot) = TYPE_VOLATILE (type);
-      MEM_SET_IN_STRUCT_P (slot, AGGREGATE_TYPE_P (type));
+      MEM_SET_IN_STRUCT_P (slot, (AGGREGATE_TYPE_P (type)
+				  || TREE_CODE (type) == COMPLEX_TYPE));
     }
   MEM_NOTRAP_P (slot) = 1;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9858417..d452713 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-14  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/torture/complex-alias-1.c: New test.
+
 2007-02-14  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* gcc.dg/tree-prof/update-tailcall.c: Use -fdump-tree-tailc
diff --git a/gcc/testsuite/gcc.dg/torture/complex-alias-1.c b/gcc/testsuite/gcc.dg/torture/complex-alias-1.c
new file mode 100644
index 0000000..6ab4ca0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/complex-alias-1.c
@@ -0,0 +1,29 @@
+/* Accesses to complex numbers were sometimes marked as scalar and
+   sometimes as struct accesses.  */
+/* { dg-do run } */
+/* { dg-options "-std=c99" } */
+
+extern void abort (void);
+static double _Complex *fp_cxd(double _Complex *cx) {
+  return cx;
+}
+
+int main( ) {
+  double _Complex cx = 4.0 + 3.0*(__extension__ 1.0iF);
+  double _Complex cx43 = 4.0 + 3.0*(__extension__ 1.0iF);
+  double _Complex cx11 = 1.0 + 1.0*(__extension__ 1.0iF);
+
+  *fp_cxd(&cx) *= cx11;
+  *fp_cxd(&cx) /= cx11;
+
+  double r_cx = __real__(cx);
+  double i_cx = __imag__(cx);
+  double r_cx43 = __real__(cx43);
+  double i_cx43 = __imag__(cx43);
+
+  if( (r_cx == r_cx43) && (i_cx == i_cx43) ) { 
+    return 0;
+  } else {
+    abort ();
+  }
+}