PR c++/85133 - ICE with missing concept initializer.

	* decl.c (cp_finish_decl): If a concept initializer is missing, use
	true.

From-SVN: r259091

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f0927e82b36d14b8498ea248cb645c3f78b6bc2e..0f857449b8f0bf8078e04af4d943e458d353f8b1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-04  Jason Merrill  <jason@redhat.com>
 
+       PR c++/85133 - ICE with missing concept initializer.
+       * decl.c (cp_finish_decl): If a concept initializer is missing, use
+       true.
+
        PR c++/85118 - wrong error with generic lambda and std::bind.
        * call.c (add_template_conv_candidate): Disable if there are any
        call operators.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index c8ae72faeae13d159969bb91563a3fc5241bc037..1cc2cd16ccc1f8d5787f19fed37df1b55d9c5217 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7010,7 +7010,10 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
       if (!VAR_P (decl) || type_dependent_p)
        /* We can't do anything if the decl has dependent type.  */;
       else if (!init && is_concept_var (decl))
-        error ("variable concept has no initializer");
+       {
+         error ("variable concept has no initializer");
+         init = boolean_true_node;
+       }
       else if (init
               && init_const_expr_p
               && TREE_CODE (type) != REFERENCE_TYPE

diff --git a/gcc/testsuite/g++.dg/concepts/var-concept7.C b/gcc/testsuite/g++.dg/concepts/var-concept7.C
new file mode 100644 (file)
index 0000000..0df4a49
--- /dev/null
+++ b/gcc/testsuite/g++.dg/concepts/var-concept7.C
@@ -0,0 +1,8 @@
+// PR c++/85133
+// { dg-additional-options "-std=c++17 -fconcepts" }
+
+template<typename> concept bool C; // { dg-error "no initializer" }
+
+template<C...> struct A {};
+
+A<int> a;