diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-07-18 20:44:51 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-07-18 20:44:51 +0200 |
| commit | 99516432c26d13ba2808daf860253b4f945336d9 (patch) | |
| tree | b7206228efa3fec183b48d41c563424e0269dcde | |
| parent | 87713c6a507659921278d32b66f2e344b7c4d124 (diff) | |
| download | gcc-99516432c26d13ba2808daf860253b4f945336d9.zip gcc-99516432c26d13ba2808daf860253b4f945336d9.tar.gz gcc-99516432c26d13ba2808daf860253b4f945336d9.tar.bz2 | |
re PR c++/71835 (ICE on invalid C++ code with ambiguous overloaded operators: tree check: expected tree that contains ‘decl minimal’ structure, have ‘pointer_type’ in convert_like_real, at cp/call.c:6549)
PR c++/71835
* call.c (build_op_call_1): Use convert_like_with_context only
if cand->fn is a decl.
* g++.dg/conversion/ambig3.C: New test.
From-SVN: r238443
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/conversion/ambig3.C | 13 |
4 files changed, 25 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 87d666e..9fa2f3a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2016-07-18 Jakub Jelinek <jakub@redhat.com> + PR c++/71835 + * call.c (build_op_call_1): Use convert_like_with_context only + if cand->fn is a decl. + PR c++/71828 * constexpr.c (cxx_eval_constant_expression) <case REALPART_EXPR>: For lval don't use cxx_eval_unary_expression and instead recurse diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 889852f..f929fb2 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4412,8 +4412,11 @@ build_op_call_1 (tree obj, vec<tree, va_gc> **args, tsubst_flags_t complain) result = build_over_call (cand, LOOKUP_NORMAL, complain); else { - obj = convert_like_with_context (cand->convs[0], obj, cand->fn, -1, - complain); + if (DECL_P (cand->fn)) + obj = convert_like_with_context (cand->convs[0], obj, cand->fn, + -1, complain); + else + obj = convert_like (cand->convs[0], obj, complain); obj = convert_from_reference (obj); result = cp_build_function_call_vec (obj, args, complain); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ff3e335..86655a0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2016-07-18 Jakub Jelinek <jakub@redhat.com> + PR c++/71835 + * g++.dg/conversion/ambig3.C: New test. + PR c++/71828 * g++.dg/cpp0x/constexpr-71828.C: New test. diff --git a/gcc/testsuite/g++.dg/conversion/ambig3.C b/gcc/testsuite/g++.dg/conversion/ambig3.C new file mode 100644 index 0000000..e17b64e --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/ambig3.C @@ -0,0 +1,13 @@ +// PR c++/71835 +// { dg-do compile } + +typedef void T (int); +struct A { operator T * (); }; // { dg-message "candidate" } +struct B { operator T * (); }; // { dg-message "candidate" } +struct C : A, B {} c; + +void +foo () +{ + c (0); // { dg-error "is ambiguous" } +} |