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/cp/pt.c | |
| 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/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |