From a6fdc0868e26ea055cd17a14bf976a805b60d6ea Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Wed, 30 Apr 2003 01:28:39 +0000 Subject: [PATCH] c-typeck.c (function_types_compatible_p): Ignore incompatible 'volatile' qualifiers on a function's return type in GNU mode. 2003-04-29 Geoffrey Keating * c-typeck.c (function_types_compatible_p): Ignore incompatible 'volatile' qualifiers on a function's return type in GNU mode. Index: testsuite/ChangeLog 2003-04-29 Geoffrey Keating * gcc.dg/noreturn-5.c: New file. * gcc.dg/noreturn-6.c: New file. From-SVN: r66281 --- gcc/ChangeLog | 5 +++++ gcc/c-typeck.c | 20 +++++++++++++++++--- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/gcc.dg/noreturn-5.c | 7 +++++++ gcc/testsuite/gcc.dg/noreturn-6.c | 4 ++++ 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/noreturn-5.c create mode 100644 gcc/testsuite/gcc.dg/noreturn-6.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af70aedd081..3b4d998f80a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-04-29 Geoffrey Keating + + * c-typeck.c (function_types_compatible_p): Ignore incompatible + 'volatile' qualifiers on a function's return type in GNU mode. + 2003-04-29 Aldy Hernandez * expr.c (emit_group_load): Dump parallels of simd types to diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 33bce26ede6..cfa2d409cc9 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -630,9 +630,23 @@ function_types_compatible_p (f1, f2) /* 1 if no need for warning yet, 2 if warning cause has been seen. */ int val = 1; int val1; - - if (!(TREE_TYPE (f1) == TREE_TYPE (f2) - || (val = comptypes (TREE_TYPE (f1), TREE_TYPE (f2))))) + tree ret1, ret2; + + ret1 = TREE_TYPE (f1); + ret2 = TREE_TYPE (f2); + + /* 'volatile' qualifiers on a function's return type mean the function + is noreturn. */ + if (pedantic && TYPE_VOLATILE (ret1) != TYPE_VOLATILE (ret2)) + pedwarn ("function return types not compatible due to `volatile'"); + if (TYPE_VOLATILE (ret1)) + ret1 = build_qualified_type (TYPE_MAIN_VARIANT (ret1), + TYPE_QUALS (ret1) & ~TYPE_QUAL_VOLATILE); + if (TYPE_VOLATILE (ret2)) + ret2 = build_qualified_type (TYPE_MAIN_VARIANT (ret2), + TYPE_QUALS (ret2) & ~TYPE_QUAL_VOLATILE); + val = comptypes (ret1, ret2); + if (val == 0) return 0; args1 = TYPE_ARG_TYPES (f1); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 14607687a20..5a7ddceb97c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2003-04-29 Geoffrey Keating + * gcc.dg/noreturn-5.c: New file. + * gcc.dg/noreturn-6.c: New file. + * gcc.c-torture/compile/inline-1.c: New file. 2003-04-29 Mark Mitchell diff --git a/gcc/testsuite/gcc.dg/noreturn-5.c b/gcc/testsuite/gcc.dg/noreturn-5.c new file mode 100644 index 00000000000..07381a66d24 --- /dev/null +++ b/gcc/testsuite/gcc.dg/noreturn-5.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99" } */ +/* Check that 'noreturn' and 'volatile extern' are compatible. + The testsuite uses -ansi -pedantic-errors by default, so this has + to override. */ +extern void xxx (int) __attribute__((noreturn)); +__volatile extern void xxx (int); diff --git a/gcc/testsuite/gcc.dg/noreturn-6.c b/gcc/testsuite/gcc.dg/noreturn-6.c new file mode 100644 index 00000000000..eb1fd243773 --- /dev/null +++ b/gcc/testsuite/gcc.dg/noreturn-6.c @@ -0,0 +1,4 @@ +/* { dg-do compile } */ +/* Check for volatile behaviour. */ +extern int xxx (void); +volatile extern int xxx (void); /* { dg-error "not compatible" } */ -- 2.30.2