From 7aabd67f18fb1e0ef4c9981667284c2e57816e01 Mon Sep 17 00:00:00 2001 From: Andrew Sutton Date: Tue, 19 Nov 2019 15:11:14 +0000 Subject: [PATCH] Suppress diagnostics substituting into a requires-expression (PR c++/92403). gcc/cp/ * pt.c (tsubst_copy_and_build): Perform the first substitution without diagnostics and a second only if tsubst_requries_expr returns an error. From-SVN: r278449 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/pt.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 30ebf18a244..819de7315a5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2019-11-19 Andrew Sutton + + PR c++/92403 + Suppress diagnostics substituting into a requires-expression. + * pt.c (tsubst_copy_and_build): Perform the first substitution without + diagnostics and a second only if tsubst_requries_expr returns an error. + 2019-11-19 Jakub Jelinek PR c++/92504 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 8f7734a7a41..424098aab3a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -20139,7 +20139,12 @@ tsubst_copy_and_build (tree t, } case REQUIRES_EXPR: - RETURN (tsubst_requires_expr (t, args, complain, in_decl)); + { + tree r = tsubst_requires_expr (t, args, tf_none, in_decl); + if (r == error_mark_node && (complain & tf_error)) + tsubst_requires_expr (t, args, complain, in_decl); + RETURN (r); + } case RANGE_EXPR: /* No need to substitute further, a RANGE_EXPR will always be built -- 2.30.2