diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-22 16:14:20 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-09-22 16:14:20 +0000 |
| commit | a5fbcfdd084d7830b729d0003a53af7e6c8ad183 (patch) | |
| tree | 912458f00caecccc802af1cf5ee2f2b34e54abac | |
| parent | 6f41bd34b2e755ce185f75efce4b996b9ebf6dfa (diff) | |
| download | gcc-a5fbcfdd084d7830b729d0003a53af7e6c8ad183.tar.gz | |
/cp
2016-09-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71979
* class.c (build_base_path): Allow for lookup_base returning
NULL_TREE.
/testsuite
2016-09-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71979
* g++.dg/cpp0x/pr71979.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@240376 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr71979.C | 15 |
4 files changed, 29 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5b0cd58fb39..1700b3fd646 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-09-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/71979 + * class.c (build_base_path): Allow for lookup_base returning + NULL_TREE. + 2016-09-16 Jakub Jelinek <jakub@redhat.com> Backported from mainline diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1687c18a217..17db99e3dc1 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -296,12 +296,13 @@ build_base_path (enum tree_code code, /* This can happen when adjust_result_of_qualified_name_lookup can't find a unique base binfo in a call to a member function. We couldn't give the diagnostic then since we might have been calling - a static member function, so we do it now. */ + a static member function, so we do it now. In other cases, eg. + during error recovery (c++/71979), we may not have a base at all. */ if (complain & tf_error) { tree base = lookup_base (probe, BINFO_TYPE (d_binfo), ba_unique, NULL, complain); - gcc_assert (base == error_mark_node); + gcc_assert (base == error_mark_node || !base); } return error_mark_node; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 36b8f0cf5ed..4a5a316b69b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/71979 + * g++.dg/cpp0x/pr71979.C: New. + 2016-09-21 Uros Bizjak <ubizjak@gmail.com> * gcc.c-torture/unsorted/dump-noaddr.x: Remove debug statements. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71979.C b/gcc/testsuite/g++.dg/cpp0x/pr71979.C new file mode 100644 index 00000000000..5decee444ed --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr71979.C @@ -0,0 +1,15 @@ +// PR c++/71979 +// { dg-do compile { target c++11 } } + +struct A +{ + A & operator= (A &); +}; + +struct B : A {}; // { dg-error "invalid initialization" } + +void foo () +{ + B b; + b = B (); // { dg-error "use of deleted" } +} |