diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/comp-return-1.c | 31 |
4 files changed, 42 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f5867e4..ce98498 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-07-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * c-decl.c (start_function): Form composite type of function types + rather than copying type from previous prototype declaration. + 2004-07-23 Janis Johnson <janis187@us.ibm.com> * config/rs6000/altivec.h (vec_lvewx, vec_lvehx, vec_lvwbx): Remove diff --git a/gcc/c-decl.c b/gcc/c-decl.c index ac812e3..93469d9 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -5712,7 +5712,8 @@ start_function (tree declspecs, tree declarator, tree attributes) TREE_TYPE (TREE_TYPE (old_decl))) && TYPE_ARG_TYPES (TREE_TYPE (decl1)) == 0) { - TREE_TYPE (decl1) = TREE_TYPE (old_decl); + TREE_TYPE (decl1) = composite_type (TREE_TYPE (old_decl), + TREE_TYPE (decl1)); current_function_prototype_locus = DECL_SOURCE_LOCATION (old_decl); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 512ac8e..ad8aacf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-07-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * gcc.dg/comp-return-1.c: New test + 2004-07-23 Janis Johnson <janis187@us.ibm.com> * gcc.dg/vmx/8-02a.c: Fix typo. diff --git a/gcc/testsuite/gcc.dg/comp-return-1.c b/gcc/testsuite/gcc.dg/comp-return-1.c new file mode 100644 index 0000000..82c3983 --- /dev/null +++ b/gcc/testsuite/gcc.dg/comp-return-1.c @@ -0,0 +1,31 @@ +/* When merging a nonprototype definition of a function with a prior + prototype declaration, the composite type of the return types must + be formed rather than just copying the function type. */ +/* Origin: Joseph Myers <jsm@polyomino.org.uk> */ +/* { dg-do compile } */ + +typedef int a[]; +typedef int a5[5]; +typedef int a10[10]; + +a *f1 (); +a5 *f1 () { return 0; } + +a *f2 (void); +a5 *f2 () { return 0; } + +a *f3 (); +a5 *f3 (void) { return 0; } + +a *f4 (void); +a5 *f4 (void) { return 0; } + +void +g (void) +{ + a10 *x; + x = f1 (); /* { dg-error "incompatible" "f1" } */ + x = f2 (); /* { dg-error "incompatible" "f2" } */ + x = f3 (); /* { dg-error "incompatible" "f3" } */ + x = f4 (); /* { dg-error "incompatible" "f4" } */ +} |