aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite
diff options
context:
space:
mode:
authorNathan Froyd <froydnj@gcc.gnu.org>2007-06-30 17:40:45 +0000
committerNathan Froyd <froydnj@gcc.gnu.org>2007-06-30 17:40:45 +0000
commit81c3e25a406b4a132c67ed93b8bbbc0ecf9caca5 (patch)
tree92adceb5c721e8ed8738925097295daabed03df4 /gcc/testsuite
parent6d409e8ab5830bbebed14e929a24a36909e85e6d (diff)
downloadgcc-81c3e25a406b4a132c67ed93b8bbbc0ecf9caca5.zip
gcc-81c3e25a406b4a132c67ed93b8bbbc0ecf9caca5.tar.gz
gcc-81c3e25a406b4a132c67ed93b8bbbc0ecf9caca5.tar.bz2
20051113-1.c (main): Use the correct type when allocating and initializing a flexible array.
* gcc.c-torture/execute/20051113-1.c (main): Use the correct type when allocating and initializing a flexible array. From-SVN: r126156
Diffstat (limited to 'gcc/testsuite')
-rw-r--r--gcc/testsuite/ChangeLog7
-rw-r--r--gcc/testsuite/gcc.c-torture/execute/20051113-1.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 59237fa..2583a15 100644
--- 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 6dbd1f0c..6a289fd 100644
--- 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;