From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Joseph S. Myers" To: nobody@gcc.gnu.org Cc: gcc-prs@gcc.gnu.org Subject: Re: c/3116: Bug with using oldstyle prototype declarations Date: Mon, 11 Jun 2001 06:36:00 -0000 Message-id: <20010611133602.32404.qmail@sourceware.cygnus.com> X-SW-Source: 2001-06/msg00403.html List-Id: The following reply was made to PR c/3116; it has been noted by GNATS. From: "Joseph S. Myers" To: Andreas Jaeger Cc: , Subject: Re: c/3116: Bug with using oldstyle prototype declarations Date: Mon, 11 Jun 2001 14:30:07 +0100 (BST) On Mon, 11 Jun 2001, Andreas Jaeger wrote: > Compile the appended code, you get: > gee:~/tmp:[0]$ /opt/gcc-3.1-devel/bin/gcc -Wall -c fgetws.c > fgetws.c: In function `fgetws': > fgetws.c:18: argument `fp' doesn't match prototype > fgetws.c:11: prototype declaration > This is a regression from gcc 2.95.3. Fixed thus. Bootstrapped with no regressions on i686-pc-linux-gnu. Applied to mainline and 3.0 branch. 2001-06-11 Joseph S. Myers * c-decl.c (store_parm_decls): When comparing types in an old-style function declaration with those from a previous prototype, compare the unqualified versions of parameter types. Fixes PR c/3116. testsuite: 2001-06-11 Joseph S. Myers * gcc.c-torture/compile/20010611-1.c: New test. --- c-decl.c.orig Mon Jun 11 10:31:10 2001 +++ c-decl.c Mon Jun 11 11:23:43 2001 @@ -6436,9 +6436,11 @@ store_parm_decls () "prototype declaration"); break; } - /* Type for passing arg must be consistent - with that declared for the arg. */ - if (! comptypes (DECL_ARG_TYPE (parm), TREE_VALUE (type))) + /* Type for passing arg must be consistent with that + declared for the arg. ISO C says we take the unqualified + type for parameters declared with qualified type. */ + if (! comptypes (TYPE_MAIN_VARIANT (DECL_ARG_TYPE (parm)), + TYPE_MAIN_VARIANT (TREE_VALUE (type)))) { if (TYPE_MAIN_VARIANT (TREE_TYPE (parm)) == TYPE_MAIN_VARIANT (TREE_VALUE (type))) --- testsuite/gcc.c-torture/compile/20010611-1.c.orig Mon Mar 26 23:57:02 2001 +++ testsuite/gcc.c-torture/compile/20010611-1.c Mon Jun 11 11:26:56 2001 @@ -0,0 +1,24 @@ +/* Origin: PR c/3116 from Andreas Jaeger . */ +/* When determining type compatibility of function types, we must remove + qualifiers from argument types. We used to fail to do this properly + in store_parm_decls when comparing prototype and non-prototype + declarations. */ +struct _IO_FILE { + int _flags; +}; + +typedef struct _IO_FILE __FILE; +typedef struct _IO_FILE _IO_FILE; +typedef long int wchar_t; + +extern wchar_t *fgetws (wchar_t *__restrict __ws, int __n, + __FILE *__restrict __stream); + +wchar_t * +fgetws (buf, n, fp) + wchar_t *buf; + int n; + _IO_FILE *fp; +{ + return (wchar_t *)0; +} -- Joseph S. Myers jsm28@cam.ac.uk