20051113-1.c (main): Use the correct type when allocating and initializing a flexible...

	* gcc.c-torture/execute/20051113-1.c (main): Use the correct type
	when allocating and initializing a flexible array.

From-SVN: r126156

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 59237fa91f52fa8ba0463d62dae2a4d202ada735..2583a15d512cb645544ab47f48adcb917f0295ac 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-30  Nathan Froyd  <froydnj@codesourcery.com>
+
+       * gcc.c-torture/execute/20051113-1.c (main): Use the correct type
+       when allocating and initializing a flexible array.
+
 2007-06-30  Daniel Franke  <franke.daniel@gmail.com>
 
        PR fortran/20373
@@ -99,7 +104,6 @@
        PR tree-opt/32417
        * gfortran.fortran-torture/compile/pr32417.f90: New test.
 
->>>>>>> .r126123
 2007-06-28  Dorit Nuzman  <dorit@il.ibm.com>
 
        * gcc.dg/vect/vect-iv-4.c: Test now passes on vect_pack_trunc
@@ -135,6 +139,7 @@
        PR c++/32111
        * g++.dg/other/friend5.C: New test.
 
+>>>>>>> .r126155
 2007-06-25  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/32464

diff --git a/gcc/testsuite/gcc.c-torture/execute/20051113-1.c b/gcc/testsuite/gcc.c-torture/execute/20051113-1.c
index 6dbd1f0c63f24f2e9fd5754404f90461d67b1df7..6a289fdf219eab17d6fad1008b233ab292fea153 100644 (file)
--- a/gcc/testsuite/gcc.c-torture/execute/20051113-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20051113-1.c
@@ -54,8 +54,8 @@ long long Sum2 (Struct3 *instrs)
     return count;
 }
 main() {
-  Struct3 *p = malloc (sizeof (int) + 3 * sizeof(Struct1));
-  memset(p, 0, sizeof(int) + 3*sizeof(Struct1));
+  Struct3 *p = malloc (sizeof (int) + 3 * sizeof(Union));
+  memset(p, 0, sizeof(int) + 3*sizeof(Union));
   p->Count = 3;
   p->List[0].a.Count = 555;
   p->List[1].a.Count = 999;