diff options
| author | Andrew Sutton <asutton@lock3software.com> | 2019-11-27 15:23:02 +0000 |
|---|---|---|
| committer | Andrew Sutton <asutton@gcc.gnu.org> | 2019-11-27 15:23:02 +0000 |
| commit | 861d4af8d82819a857e360949545651adf33a264 (patch) | |
| tree | 231f0fe9b111f132f4b47a343e458ff6be85c9f3 /gcc/cp/cp-gimplify.c | |
| parent | 50e0c6e429e7cc664f6fcea59db22826f005ca19 (diff) | |
| download | gcc-861d4af8d82819a857e360949545651adf33a264.zip gcc-861d4af8d82819a857e360949545651adf33a264.tar.gz gcc-861d4af8d82819a857e360949545651adf33a264.tar.bz2 | |
re PR c++/92236 ([concepts] Explain non-satisfaction in static_assert)
2019-11-27 Andrew Sutton <asutton@lock3software.com>
PR c++/92236
Defer evaluation of concept checks so that static assertions can
emit more detailed diagnostics.
gcc/cp/
* constexpr.c (cxx_eval_call_expression): Handle concept checks.
(cxx_eval_constant_expression): Diagnose misuse of function concepts
as template-id expressions. Follow the usual return path for results.
(cxx_eval_outermost_constant_expr): Avoid calling
cp_get_callee_fndecl_nofold for function concepts.
* constraint.cc (build_function_check): Fully type the concept check
so that we don't ICE in conversions.
* cp-gimplify.c (cp_genericize_r) [CALL_EXPR]: Handle concept checks.
[TEMPLATE_ID_EXPR] Likewise.
* cvt.c (convert_to_void): Always evaluate concept checks so we don't
accidentally ignore them. Substitution during satisfaction can make
a program ill-formed (example in g++.dg/cpp2a/concepts6.C).
* pt.c (tsubst_copy_and_build): [CALL_EXPR]: Don't evaluate concepts.
[TEMPLATE_ID_EXPR]: Likewise.
* semantics.c (finish_call_expr): Don't evaluate concepts.
(finish_id_expression_1): Likewise.
(finish_static_assert): Preserve the original condition so we can
diagnose concept errors when a check returns false.
gcc/testsuite/
* g++.dg/cpp2a/concepts-iconv1.C: Update diagnostics.
* g++.dg/cpp2a/concepts-requires5.C: Likewise.
* g++.dg/cpp2a/concepts6.C: New test.
From-SVN: r278775
Diffstat (limited to 'gcc/cp/cp-gimplify.c')
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 6076697..7942afa 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -1622,6 +1622,15 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) break; case CALL_EXPR: + /* Evaluate function concept checks instead of treating them as + normal functions. */ + if (concept_check_p (stmt)) + { + *stmt_p = evaluate_concept_check (stmt, tf_warning_or_error); + * walk_subtrees = 0; + break; + } + if (!wtd->no_sanitize_p && sanitize_flags_p ((SANITIZE_NULL | SANITIZE_ALIGNMENT | SANITIZE_VPTR))) @@ -1679,6 +1688,13 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) TARGET_EXPR_NO_ELIDE (stmt) = 1; break; + case TEMPLATE_ID_EXPR: + gcc_assert (concept_check_p (stmt)); + /* Emit the value of the concept check. */ + *stmt_p = evaluate_concept_check (stmt, tf_warning_or_error); + walk_subtrees = 0; + break; + default: if (IS_TYPE_OR_DECL_P (stmt)) *walk_subtrees = 0; |