diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-10-25 13:48:10 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-10-25 13:48:10 +0000 |
| commit | df9ee5c8290238799b2e808b67c21aa8164b51f5 (patch) | |
| tree | 2959658d0e342d3e47df32f4bf5915d78a8cd004 /gcc | |
| parent | 4bc514327182abb75dc040608bdabce201f2990c (diff) | |
| download | gcc-df9ee5c8290238799b2e808b67c21aa8164b51f5.zip gcc-df9ee5c8290238799b2e808b67c21aa8164b51f5.tar.gz gcc-df9ee5c8290238799b2e808b67c21aa8164b51f5.tar.bz2 | |
re PR c++/50858 (segfault at ../../gcc/libiberty/hashtab.c:981)
/cp
2011-10-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50858
* typeck.c (composite_pointer_type_r): Check return value of
composite_pointer_type_r for error_mark_node.
/testsuite
2011-10-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50858
* g++.dg/overload/operator5.C: New.
/cp
2011-10-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50861
* pt.c (tsubst_copy_and_build): Check return value of
tsubst_copy_and_build for error_mark_node.
/testsuite
2011-10-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50861
* g++.dg/template/crash108.C: New.
From-SVN: r180430
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/overload/operator5.C | 16 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash108.C | 5 |
6 files changed, 52 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e48091f..58c00de 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,15 @@ +2011-10-25 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50858 + * typeck.c (composite_pointer_type_r): Check return value of + composite_pointer_type_r for error_mark_node. + +2011-10-25 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50861 + * pt.c (tsubst_copy_and_build): Check return value of + tsubst_copy_and_build for error_mark_node. + 2011-10-23 Paolo Carlini <paolo.carlini@oracle.com> PR c++/50841 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 56fa632..79da373 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13511,6 +13511,9 @@ tsubst_copy_and_build (tree t, tree unq = (tsubst_copy_and_build (function, args, complain, in_decl, true, integral_constant_expression_p)); + if (unq == error_mark_node) + return error_mark_node; + if (unq != function) { tree fn = unq; diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 749aa3f..e583faa 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -510,8 +510,12 @@ composite_pointer_type_r (tree t1, tree t2, && TREE_CODE (pointee2) == POINTER_TYPE) || (TYPE_PTR_TO_MEMBER_P (pointee1) && TYPE_PTR_TO_MEMBER_P (pointee2))) - result_type = composite_pointer_type_r (pointee1, pointee2, operation, - complain); + { + result_type = composite_pointer_type_r (pointee1, pointee2, operation, + complain); + if (result_type == error_mark_node) + return error_mark_node; + } else { if (complain & tf_error) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7cf4d3f..40e1de1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2011-10-25 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50858 + * g++.dg/overload/operator5.C: New. + +2011-10-25 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50861 + * g++.dg/template/crash108.C: New. + 2011-10-25 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/50596 diff --git a/gcc/testsuite/g++.dg/overload/operator5.C b/gcc/testsuite/g++.dg/overload/operator5.C new file mode 100644 index 0000000..574defb --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/operator5.C @@ -0,0 +1,16 @@ +// PR c++/50858 + +class String { + typedef struct ImplicitConversionFromWTFStringToBoolDisallowedA* + (String::*UnspecifiedBoolTypeA); + typedef struct ImplicitConversionFromWTFStringToBoolDisallowedB* + (String::*UnspecifiedBoolTypeB); + operator UnspecifiedBoolTypeA() const; + operator UnspecifiedBoolTypeB() const; +}; +inline bool equalIgnoringCase(const String& a, const String& b) { } +inline bool equalPossiblyIgnoringCase(const String& a, + const String& b, + bool ignoreCase) { + return ignoreCase ? equalIgnoringCase(a, b) : (a == b); } // { dg-error "ambiguous" } +// { dg-message "note" { target *-*-* } 15 } diff --git a/gcc/testsuite/g++.dg/template/crash108.C b/gcc/testsuite/g++.dg/template/crash108.C new file mode 100644 index 0000000..0b25fde --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash108.C @@ -0,0 +1,5 @@ +// PR c++/50861 + +template<class T> struct A {A(int b=k(0));}; // { dg-error "arguments" } +void f(int k){A<int> a;} // // { dg-error "parameter|declared" } +// { dg-message "note" { target *-*-* } 3 } |