diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-16 22:36:12 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-16 22:36:12 -0400 |
| commit | 9f2a22d0b89e8e4208e84aaeab23f563c085c6c8 (patch) | |
| tree | dc1db96edce1ece695de9de85fd30dcca9324049 /gcc | |
| parent | 3f7c74538130857eec303f1470673199ee7142d0 (diff) | |
| download | gcc-9f2a22d0b89e8e4208e84aaeab23f563c085c6c8.zip gcc-9f2a22d0b89e8e4208e84aaeab23f563c085c6c8.tar.gz gcc-9f2a22d0b89e8e4208e84aaeab23f563c085c6c8.tar.bz2 | |
re PR c++/46336 ([C++0X] ICE on invalid: in register_constexpr_fundef, at cp/semantics.c:5571)
PR c++/46336
* decl.c (duplicate_decls): Return NULL_TREE for clashing
C functions.
From-SVN: r171084
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C | 14 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/friend5.C | 1 |
5 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 074c776..66c8316 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-03-16 Jason Merrill <jason@redhat.com> + PR c++/46336 + * decl.c (duplicate_decls): Return NULL_TREE for clashing + C functions. + PR c++/47570 * semantics.c (cxx_eval_constant_expression) [COMPOUND_EXPR]: Don't use the generic binary expression handling. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3139ad8..17b3163 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1456,6 +1456,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) error ("declaration of C function %q#D conflicts with", newdecl); error ("previous declaration %q+#D here", olddecl); + return NULL_TREE; } else if (compparms (TYPE_ARG_TYPES (TREE_TYPE (newdecl)), TYPE_ARG_TYPES (TREE_TYPE (olddecl)))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 355e09d..122beef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-03-16 Jason Merrill <jason@redhat.com> + * g++.dg/cpp0x/constexpr-46336.C: New. + * g++.dg/parse/friend5.C: Adjust expected errors. + * g++.dg/cpp0x/constexpr-47570.C: New. 2011-03-16 Dodji Seketeli <dodji@redhat.com> diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C new file mode 100644 index 0000000..3c51c2c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C @@ -0,0 +1,14 @@ +// PR c++/46336 +// { dg-options -std=c++0x } + +extern "C" { + enum A { }; + inline constexpr A + f(A a, A b) // { dg-error "previous declaration" } + { return A(static_cast<int>(a) & static_cast<int>(b)); } + enum B { }; + inline constexpr B + f(B a, B b) // { dg-error "C function" } + { return B(static_cast<int>(a) & static_cast<int>(b)); } +} + diff --git a/gcc/testsuite/g++.dg/parse/friend5.C b/gcc/testsuite/g++.dg/parse/friend5.C index ec134c2..bf1e6bf 100644 --- a/gcc/testsuite/g++.dg/parse/friend5.C +++ b/gcc/testsuite/g++.dg/parse/friend5.C @@ -4,5 +4,4 @@ extern "C" struct A { friend void foo(int) {} // { dg-error "declaration" } friend void foo() {} // { dg-error "foo" "err" } - // { dg-warning "already a friend" "warn" { target *-*-* } 6 } }; |