From e068b46f13d990d92791284b210ad6fd4fba8891 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 25 Jun 2018 19:26:53 +0200 Subject: [PATCH] backport: re PR c++/84662 (internal compiler error: tree check: expected class 'type', have 'exceptional' (error_mark) in is_bitfield_expr_with_lowered_type, at cp/typeck.c:1944) Backported from mainline 2018-03-02 Jakub Jelinek PR c++/84662 * pt.c (tsubst_copy_and_build) : Use RETURN instead of return. : Likewise. : If op0 is error_mark_node, just return it instead of wrapping it into CONVERT_EXPR. * g++.dg/cpp1y/pr84662.C: New test. From-SVN: r262069 --- gcc/cp/ChangeLog | 9 +++++++++ gcc/cp/pt.c | 8 +++++--- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp1y/pr84662.C | 6 ++++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr84662.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3697ff7e9907..2748e4df8476 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,6 +1,15 @@ 2018-06-25 Jakub Jelinek Backported from mainline + 2018-03-02 Jakub Jelinek + + PR c++/84662 + * pt.c (tsubst_copy_and_build) : Use + RETURN instead of return. + : Likewise. + : If op0 is error_mark_node, just return + it instead of wrapping it into CONVERT_EXPR. + 2018-02-26 Jakub Jelinek PR c++/84558 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3f57c6afc689..5d32c79ac20f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16093,7 +16093,7 @@ tsubst_copy_and_build (tree t, if (targs) targs = tsubst_template_args (targs, args, complain, in_decl); if (targs == error_mark_node) - return error_mark_node; + RETURN (error_mark_node); if (variable_template_p (templ)) RETURN (lookup_and_finish_template_variable (templ, targs, complain)); @@ -16158,6 +16158,8 @@ tsubst_copy_and_build (tree t, { tree type = tsubst (TREE_TYPE (t), args, complain, in_decl); tree op0 = RECUR (TREE_OPERAND (t, 0)); + if (op0 == error_mark_node) + RETURN (error_mark_node); RETURN (build1 (CONVERT_EXPR, type, op0)); } @@ -16305,7 +16307,7 @@ tsubst_copy_and_build (tree t, { tree op0 = RECUR (TREE_OPERAND (t, 0)); tree op1 = RECUR (TREE_OPERAND (t, 1)); - return fold_build_pointer_plus (op0, op1); + RETURN (fold_build_pointer_plus (op0, op1)); } case SCOPE_REF: @@ -17111,7 +17113,7 @@ tsubst_copy_and_build (tree t, variadic capture proxy, we instantiate the elements when needed. */ gcc_assert (DECL_HAS_VALUE_EXPR_P (t)); - return RECUR (DECL_VALUE_EXPR (t)); + RETURN (RECUR (DECL_VALUE_EXPR (t))); } /* Fall through */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index df0872636786..22893b53d0fa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -3,6 +3,9 @@ Backported from mainline 2018-03-02 Jakub Jelinek + PR c++/84662 + * g++.dg/cpp1y/pr84662.C: New test. + PR inline-asm/84625 * gcc.target/i386/pr84625.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp1y/pr84662.C b/gcc/testsuite/g++.dg/cpp1y/pr84662.C new file mode 100644 index 000000000000..36bd201073e5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr84662.C @@ -0,0 +1,6 @@ +// PR c++/84662 +// { dg-do compile { target c++14 } } +// { dg-options "" } + +double b; +a (__attribute__((c (0 && int() - ([] {} && b) || auto)))); // { dg-error "expected constructor, destructor, or type conversion before" } -- 2.47.2