From a0ff8620961065711c1edb1cb7bf4c86c8408d99 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Mon, 26 Oct 2009 14:40:16 +0000 Subject: [PATCH] re PR c++/41020 (Can't declare an extern "C" friend of a builtin function) Fix PR c++/41020 gcc/cp/ChangeLog: PR c++/41020 * decl.c (decls_match): Use DECL_IS_BUILTIN instead of DECL_BUILT_IN. gcc/testsuite/ChangeLog: PR c++/41020 * g++.dg/lookup/extern-c-redecl2.C: New test. * g++.dg/lookup/extern-c-redecl3.C: Likewise. * g++.dg/lookup/extern-c-redecl4.C: Likewise. * g++.dg/lookup/extern-c-redecl5.C: Likewise. From-SVN: r153552 --- gcc/cp/ChangeLog | 6 +++++ gcc/cp/decl.c | 2 +- gcc/testsuite/ChangeLog | 8 +++++++ .../g++.dg/lookup/extern-c-redecl2.C | 21 ++++++++++++++++++ .../g++.dg/lookup/extern-c-redecl3.C | 22 +++++++++++++++++++ .../g++.dg/lookup/extern-c-redecl4.C | 19 ++++++++++++++++ .../g++.dg/lookup/extern-c-redecl5.C | 18 +++++++++++++++ 7 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/lookup/extern-c-redecl2.C create mode 100644 gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C create mode 100644 gcc/testsuite/g++.dg/lookup/extern-c-redecl4.C create mode 100644 gcc/testsuite/g++.dg/lookup/extern-c-redecl5.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3ce735b3fe9..467f0782c3f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-10-26 Dodji Seketeli + + PR c++/41020 + * decl.c (decls_match): Use DECL_IS_BUILTIN instead of + DECL_BUILT_IN. + 2009-10-23 Dodji Seketeli PR c++/40808 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5eb389fe7e3..c772ca5d364 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -935,7 +935,7 @@ decls_match (tree newdecl, tree olddecl) #ifdef NO_IMPLICIT_EXTERN_C /* A new declaration doesn't match a built-in one unless it is also extern "C". */ - if (DECL_BUILT_IN (olddecl) + if (DECL_IS_BUILTIN (olddecl) && DECL_EXTERN_C_P (olddecl) && !DECL_EXTERN_C_P (newdecl)) return 0; #endif diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0b33f9813a9..e6e925072fb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2009-10-26 Dodji Seketeli + + PR c++/41020 + * g++.dg/lookup/extern-c-redecl2.C: New test. + * g++.dg/lookup/extern-c-redecl3.C: Likewise. + * g++.dg/lookup/extern-c-redecl4.C: Likewise. + * g++.dg/lookup/extern-c-redecl5.C: Likewise. + 2009-10-26 Michael Matz PR tree-optimization/41783 diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl2.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl2.C new file mode 100644 index 00000000000..055148f3841 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl2.C @@ -0,0 +1,21 @@ +// Contributed by Dodji Seketeli +// Origin PR c++/41020 +// { dg-do compile } + +extern "C" +{ + int fork (void); +} + +class frok +{ + int this_errno; + friend int fork (void); +}; + +extern "C" int +fork (void) +{ + frok grouped; + return grouped.this_errno; +} diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C new file mode 100644 index 00000000000..00ff4a966ce --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C @@ -0,0 +1,22 @@ +// Contributed by Dodji Seketeli +// Origin: PR c++/41020 +// { dg-do compile } +// { dg-final { scan-assembler-not "call\[\t \]+_Z4forkv" } } +// { dg-final { scan-assembler "call\[\t \]+fork" } } + +extern "C" int fork (void); + +void +foo () +{ + extern int fork (void); + fork (); +} + +extern "C" +int +fork (void) +{ + return 0; +} + diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl4.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl4.C new file mode 100644 index 00000000000..9dfa54dad4d --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl4.C @@ -0,0 +1,19 @@ +// Contributed by Dodji Seketeli +// Origin: PR c++/41020 + +// Avoid the "-ansi -pedantic" option +// { dg-options "" } +// { dg-do compile } +// { dg-final { scan-assembler "call\[\t \]+_Z4forkv" } } + +class frok +{ + int this_errno; + friend int fork (void); +}; + +void +foo () +{ + fork (); +} diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl5.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl5.C new file mode 100644 index 00000000000..031059f7657 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl5.C @@ -0,0 +1,18 @@ +// Contributed by Dodji Seketeli +// Origin: PR c++/41020 +// { dg-do compile } + + +class frok +{ + int this_errno; + friend int fork (void); // { dg-error "previous declaration .*?C++. linkage" } +}; + +extern "C" int +fork (void) // { dg-error "conflicts with new declaration .*?C. linkage" }} +{ + frok grouped; + return grouped.this_errno; +} +