diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4fb0bc82c31..72d6cc3ad98 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19829,6 +19829,8 @@ tsubst_copy_and_build (tree t, parameter packs are of length zero. */ if (init == NULL_TREE && TREE_OPERAND (t, 3) == NULL_TREE) init_vec = NULL; + else if (init == error_mark_node) + RETURN (error_mark_node); else { init_vec = make_tree_vector (); diff --git a/gcc/testsuite/g++.dg/eh/crash2.C b/gcc/testsuite/g++.dg/eh/crash2.C new file mode 100644 index 00000000000..fff8e142fd6 --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/crash2.C @@ -0,0 +1,20 @@ +// PR c++/97187 +// { dg-do compile { target c++14 } } +// { dg-options "-fno-exceptions" } + +auto yp = [] { return 0; }; + +template +DI +zl () +{ + auto au = [] () -> DI { return *new auto (true ? yp : throw); }; // { dg-error "exception handling disabled" } + + return au (); +} + +auto +vd () +{ + return zl (); +} diff --git a/gcc/testsuite/g++.dg/template/crash132.C b/gcc/testsuite/g++.dg/template/crash132.C new file mode 100644 index 00000000000..f6f4863e937 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash132.C @@ -0,0 +1,6 @@ +// PR c++/97993 +// { dg-do compile { target c++14 } } + +template T a; +template auto foo (); +struct S decltype (foo ); // { dg-error "" }