diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-23 21:37:59 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-10-23 21:37:59 +0000 |
| commit | 6940f1f12db7b9b0120cbb1d7eea817b11a55b5f (patch) | |
| tree | 485633823f06beb7a4bc073fca832cade0ef93a8 | |
| parent | c68c23aba227fe6d449414adf262fc4683445164 (diff) | |
| download | gcc-6940f1f12db7b9b0120cbb1d7eea817b11a55b5f.tar.gz | |
/cp
2017-10-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80449
* semantics.c (finish_compound_literal): Check do_auto_deduction
return value for error_mark_node.
/testsuite
2017-10-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/80449
* g++.dg/cpp1z/class-deduction46.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254026 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/class-deduction46.C | 6 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9514e9c1c27..2d9c0b133c0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-10-23 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/80449 + * semantics.c (finish_compound_literal): Check do_auto_deduction + return value for error_mark_node. + 2017-10-23 Jason Merrill <jason@redhat.com> PR c++/77369 - wrong noexcept handling in C++14 and below diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index a512664e396..71318b924b8 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2711,8 +2711,12 @@ finish_compound_literal (tree type, tree compound_literal, if (tree anode = type_uses_auto (type)) if (CLASS_PLACEHOLDER_TEMPLATE (anode)) - type = do_auto_deduction (type, compound_literal, anode, complain, - adc_variable_type); + { + type = do_auto_deduction (type, compound_literal, anode, complain, + adc_variable_type); + if (type == error_mark_node) + return error_mark_node; + } if (processing_template_decl) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f6fd200329a..d63fd0b5389 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-23 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/80449 + * g++.dg/cpp1z/class-deduction46.C: New. + 2017-10-23 Jakub Jelinek <jakub@redhat.com> PR debug/82630 diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction46.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction46.C new file mode 100644 index 00000000000..cf38ed65fa8 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction46.C @@ -0,0 +1,6 @@ +// PR c++/80449 +// { dg-options -std=c++17 } + +template<class S> struct C; +template<> struct C<int> { C(int, int) {} }; +auto k = C{0, 0}; // { dg-error "cannot deduce" } |