diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/inherit/crash3.C | 11 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9983034..0c118f1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2011-12-01 Paolo Carlini <paolo.carlini@oracle.com> + PR c++/51326 + * call.c (build_user_type_conversion_1): Early return NULL if + expr is NULL_TREE. + +2011-12-01 Paolo Carlini <paolo.carlini@oracle.com> + PR c++/51367 * pt.c (unify_inconsistency): Use either %qT or %qE depending on whether parm is a type or non-type parameter. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index ab06542..e7bbf0a 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3373,7 +3373,7 @@ static struct z_candidate * build_user_type_conversion_1 (tree totype, tree expr, int flags) { struct z_candidate *candidates, *cand; - tree fromtype = TREE_TYPE (expr); + tree fromtype; tree ctors = NULL_TREE; tree conv_fns = NULL_TREE; conversion *conv = NULL; @@ -3382,6 +3382,11 @@ build_user_type_conversion_1 (tree totype, tree expr, int flags) bool any_viable_p; int convflags; + if (!expr) + return NULL; + + fromtype = TREE_TYPE (expr); + /* We represent conversion within a hierarchy using RVALUE_CONV and BASE_CONV, as specified by [over.best.ics]; these become plain constructor calls, as specified in [dcl.init]. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d0548ca..084ef443 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-01 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/51326 + * g++.dg/inherit/crash3.C: New. + 2011-12-01 Nathan Sidwell <nathan@acm.org> PR gcov-profile/51113 diff --git a/gcc/testsuite/g++.dg/inherit/crash3.C b/gcc/testsuite/g++.dg/inherit/crash3.C new file mode 100644 index 0000000..e6094b0 --- /dev/null +++ b/gcc/testsuite/g++.dg/inherit/crash3.C @@ -0,0 +1,11 @@ +// PR c++/51326 + +struct A +{ + virtual int& foo(); // { dg-error "overriding" } +}; + +struct B : A +{ + B& foo(); // { dg-error "conflicting return type" } +}; |