diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2016-09-22 15:26:23 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2016-09-22 15:26:23 +0000 |
| commit | a608d15bedbdfd925f099d11e4a826f433bb3a41 (patch) | |
| tree | be22a099bd5a6401212867a319ef06598e38382f /gcc | |
| parent | ed64a4e75f2ff16fa34a738dd5b923b45b4b9eac (diff) | |
| download | gcc-a608d15bedbdfd925f099d11e4a826f433bb3a41.zip gcc-a608d15bedbdfd925f099d11e4a826f433bb3a41.tar.gz gcc-a608d15bedbdfd925f099d11e4a826f433bb3a41.tar.bz2 | |
re PR c++/71979 (ICE with on C++ code with incorrect type in overloaded base class '=' operator: in build_base_path, at cp/class.c:304)
/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.
From-SVN: r240373
Diffstat (limited to 'gcc')
| -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 61d41e7..3a4d1f4 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-21 Jason Merrill <jason@redhat.com> Core 903 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 7362c73..dab1630 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 8adecc0..6daa921 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-22 Bernd Edlinger <bernd.edlinger@hotmail.de> * g++.dg/pr77550.C: Use __SIZE_TYPE__. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71979.C b/gcc/testsuite/g++.dg/cpp0x/pr71979.C new file mode 100644 index 0000000..e67eed1 --- /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 "cannot bind" } + +void foo () +{ + B b; + b = B (); // { dg-error "use of deleted" } +} |