diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-16 16:03:46 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-16 16:03:46 -0400 |
| commit | 85a273bae4165216919c029f0dfa28ca5800aa23 (patch) | |
| tree | 261f49586db7d14d30580f1d98f41222c349990b /gcc | |
| parent | 51fd6b9057dd38a0566c86df2dcda8ace597eed9 (diff) | |
| download | gcc-85a273bae4165216919c029f0dfa28ca5800aa23.zip gcc-85a273bae4165216919c029f0dfa28ca5800aa23.tar.gz gcc-85a273bae4165216919c029f0dfa28ca5800aa23.tar.bz2 | |
re PR c++/48115 (internal compiler error: in type_has_nontrivial_copy_init, at cp/tree.c:2482)
PR c++/48115
* call.c (convert_arg_to_ellipsis): Handle incomplete type.
From-SVN: r171066
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/incomplete6.C | 22 |
4 files changed, 35 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8a40829..336c22e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2011-03-16 Jason Merrill <jason@redhat.com> + PR c++/48115 + * call.c (convert_arg_to_ellipsis): Handle incomplete type. + +2011-03-16 Jason Merrill <jason@redhat.com> + * parser.c (cp_parser_abort_tentative_parse): Make sure we haven't committed to this tentative parse. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 388f46c..f75c248 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5671,6 +5671,10 @@ convert_arg_to_ellipsis (tree arg) arg_type = TREE_TYPE (arg); if (arg != error_mark_node + /* In a template (or ill-formed code), we can have an incomplete type + even after require_complete_type, in which case we don't know + whether it has trivial copy or not. */ + && COMPLETE_TYPE_P (arg_type) && (type_has_nontrivial_copy_init (arg_type) || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (arg_type))) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 72f30d8..ca82c74 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-16 Jason Merrill <jason@redhat.com> + + * g++.dg/template/incomplete6.C: New. + 2011-03-16 Jeff Law <law@redhat.com> * gcc.dg/tree-ssa/vrp55.c: New test. diff --git a/gcc/testsuite/g++.dg/template/incomplete6.C b/gcc/testsuite/g++.dg/template/incomplete6.C new file mode 100644 index 0000000..7138b6a --- /dev/null +++ b/gcc/testsuite/g++.dg/template/incomplete6.C @@ -0,0 +1,22 @@ +// PR c++/48115 + +template<typename> struct templ { }; + +template<typename T> T declval(); + +typedef int (*F2)(...); + +template<int> struct Int { }; + +template<typename F, typename T> +struct S +{ + template<typename A> + Int<sizeof( declval<F>()(T()) )> + f(A); +}; + +int main() +{ + S<F2, templ<int> >().f(0); +} |