diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-04-19 18:09:45 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-04-19 18:09:45 +0000 |
| commit | f62a0ddd737a3faa3925ae211bd22fa8ca62c112 (patch) | |
| tree | 4b6f7a8e5c29316cba5ea0068f87786c1e151afc /gcc | |
| parent | 5707be3c7da6196efcef2d86e623771153eb6c7f (diff) | |
| download | gcc-f62a0ddd737a3faa3925ae211bd22fa8ca62c112.zip gcc-f62a0ddd737a3faa3925ae211bd22fa8ca62c112.tar.gz gcc-f62a0ddd737a3faa3925ae211bd22fa8ca62c112.tar.bz2 | |
re PR c++/84611 (ICE in operator[], at vec.h:826 (local_class_index()))
/cp
2018-04-19 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84611
* pt.c (lookup_template_class_1): Check pushtag return value for
error_mark_node.
/testsuite
2018-04-19 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84611
* g++.dg/parse/crash68.C: New.
From-SVN: r259505
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/crash68.C | 18 |
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4475b22..e4c3deb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-04-19 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84611 + * pt.c (lookup_template_class_1): Check pushtag return value for + error_mark_node. + 2018-04-19 Alexandre Oliva <aoliva@redhat.com> PR c++/80290 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5d70608..1370e21 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9444,7 +9444,9 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context, /* A local class. Make sure the decl gets registered properly. */ if (context == current_function_decl) - pushtag (DECL_NAME (gen_tmpl), t, /*tag_scope=*/ts_current); + if (pushtag (DECL_NAME (gen_tmpl), t, /*tag_scope=*/ts_current) + == error_mark_node) + return error_mark_node; if (comp_template_args (CLASSTYPE_TI_ARGS (template_type), arglist)) /* This instantiation is another name for the primary diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e7b9547..bff3cd6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-19 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84611 + * g++.dg/parse/crash68.C: New. + 2018-04-19 H.J. Lu <hongjiu.lu@intel.com> PR libgcc/85334 diff --git a/gcc/testsuite/g++.dg/parse/crash68.C b/gcc/testsuite/g++.dg/parse/crash68.C new file mode 100644 index 0000000..8c1e4ba --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash68.C @@ -0,0 +1,18 @@ +// PR c++/84611 + +template<typename = int> +struct a { + a() { + struct c; + try { + } catch (struct c {}) { // { dg-error "types may not be defined|conflicting" } + } + } +}; + +struct d { + d(); + a<> b; +}; + +d::d() {} |