Make -fconcepts-ts imply -fconcepts.

	* c-opts.c (c_common_post_options): -fconcepts-ts implies
	-fconcepts.

From-SVN: r277859

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index d95424537a9874d07eeaeb483a69b73c9695866f..7f402960fc3486e489fa21a47dadf808ee96e91b 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-05  Jason Merrill  <jason@redhat.com>
+
+       * c-opts.c (c_common_post_options): -fconcepts-ts implies
+       -fconcepts.
+
 2019-11-04  Kamlesh Kumar  <kamleshbhalui@gmail.com>
 
        * c-opts.c (c_common_post_options): Update

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index d4c77be5cd56477312148511deb02ed7af12b3fb..b84f05c64c7aa4b1a4306dea10ce8ad42191b6ef 100644 (file)
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -1038,7 +1038,7 @@ c_common_post_options (const char **pfilename)
      to know when concepts are enabled. Note that -fconcepts-ts can
      be used to include additional features, although modified to
      work with the standard.  */
-  if (cxx_dialect >= cxx2a)
+  if (cxx_dialect >= cxx2a || flag_concepts_ts)
     flag_concepts = 1;
   else if (flag_concepts)
     /* For -std=c++17 -fconcepts, imply -fconcepts-ts.  */

diff --git a/gcc/testsuite/g++.dg/concepts/fn7.C b/gcc/testsuite/g++.dg/concepts/fn7.C
index 869cb9c93910c14630322869031dc2ed72f81be4..1994feca84ba10a09f2f0c9dfba06db20e27fc85 100644 (file)
--- a/gcc/testsuite/g++.dg/concepts/fn7.C
+++ b/gcc/testsuite/g++.dg/concepts/fn7.C
@@ -1,5 +1,5 @@
 // { dg-do link { target c++14 } }
-// { dg-options "-fconcepts" }
+// { dg-options "-fconcepts-ts" }
 
 void f() requires true { }