public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-8346] c++: Don't emit deprecated warnings or unavailable errors on lambda declarations
@ 2022-05-06  9:57 Jakub Jelinek
  0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2022-05-06  9:57 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:8b26d0e28bb1875392f0689266a5f5f0a7737418

commit r12-8346-g8b26d0e28bb1875392f0689266a5f5f0a7737418
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Wed May 4 10:07:36 2022 +0200

    c++: Don't emit deprecated warnings or unavailable errors on lambda declarations
    
    On the following testcase, we emit deprecated warnings or unavailable errors
    even on merge declarations of those lambdas (the dg-bogus directives), while
    IMHO we should emit them only when something actually calls those lambdas.
    
    The following patch temporarily disables that diagnostics during
    maybe_add_lambda_conv_op.
    
    PR2173R1 also says that ambiguity between attribute-specifier-seq at the
    end of requires-clause and attribute-specifier-seq from lambda-expression
    should be resolved to attribute-specifier-seq for the latter.  Do we need
    to do anything about that?  I mean, can a valid requires-clause end with
    an attribute-specifier-seq?  Say operator int [[]] is valid primary
    expression, but requires operator int [[]] isn't valid, nor is
    requires operator int, no?
    
    2022-05-04  Jakub Jelinek  <jakub@redhat.com>
    
            * lambda.cc: Include decl.h.
            (maybe_add_lambda_conv_op): Temporarily override deprecated_state to
            UNAVAILABLE_DEPRECATED_SUPPRESS.
    
            * g++.dg/cpp23/lambda-attr1.C: New test.
            * g++.dg/cpp23/lambda-attr2.C: New test.
    
    (cherry picked from commit 1c8e9bed9b9d46d479b83ae05b334543f66961fb)

Diff:
---
 gcc/cp/lambda.cc                          | 12 +++++++---
 gcc/testsuite/g++.dg/cpp23/lambda-attr1.C | 37 +++++++++++++++++++++++++++++++
 gcc/testsuite/g++.dg/cpp23/lambda-attr2.C | 19 ++++++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/lambda.cc b/gcc/cp/lambda.cc
index 65579edc316..ce49e28cd4c 100644
--- a/gcc/cp/lambda.cc
+++ b/gcc/cp/lambda.cc
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "gimplify.h"
 #include "target.h"
+#include "decl.h"
 
 /* Constructor for a lambda expression.  */
 
@@ -1193,9 +1194,14 @@ maybe_add_lambda_conv_op (tree type)
 	}
     }
   else
-    call = build_call_a (callop,
-			 direct_argvec->length (),
-			 direct_argvec->address ());
+    {
+      /* Don't warn on deprecated or unavailable lambda declarations, unless
+	 the lambda is actually called.  */
+      auto du = make_temp_override (deprecated_state,
+				    UNAVAILABLE_DEPRECATED_SUPPRESS);
+      call = build_call_a (callop, direct_argvec->length (),
+			   direct_argvec->address ());
+    }
 
   CALL_FROM_THUNK_P (call) = 1;
   SET_EXPR_LOCATION (call, UNKNOWN_LOCATION);
diff --git a/gcc/testsuite/g++.dg/cpp23/lambda-attr1.C b/gcc/testsuite/g++.dg/cpp23/lambda-attr1.C
new file mode 100644
index 00000000000..a653c732fca
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp23/lambda-attr1.C
@@ -0,0 +1,37 @@
+// P2173R1 - Attributes on Lambda-Expressions
+// { dg-do compile { target c++11 } }
+
+void
+foo (bool x, bool y)
+{
+  auto a = [][[noreturn]] () {};	// { dg-warning "'noreturn' function does return" }
+  if (x)
+    a ();
+  auto b = [][[noreturn]] {};		// { dg-warning "'noreturn' function does return" }
+  if (y)
+    b ();
+  auto c = [] [[ deprecated ]] () {};	// { dg-bogus "is deprecated" }
+  c ();					// { dg-warning "'foo\\\(bool, bool\\\)::<lambda\\\(\\\)>' is deprecated" }
+  auto d = [][[deprecated]] {};		// { dg-bogus "is deprecated" }
+  d ();					// { dg-warning "'foo\\\(bool, bool\\\)::<lambda\\\(\\\)>' is deprecated" }
+#if __cpp_generic_lambdas >= 201304
+  auto e = [] [[deprecated]] (auto x) {};	// { dg-bogus "is deprecated" }
+  e (0.0);				// { dg-warning "'foo\\\(bool, bool\\\)::<lambda\\\(auto:1\\\)>\[^\n\r]*' is deprecated" "" { target c++14 } }
+#endif
+#if __cpp_generic_lambdas >= 201707
+  auto f = [] <typename T> [[deprecated]] (T) {};	// { dg-bogus "is deprecated" }
+  f (1);				// { dg-warning "'foo\\\(bool, bool\\\)::<lambda\\\(T\\\)>\[^\n\r]*' is deprecated" "" { target c++20 } }
+#endif
+  auto g = [][[nodiscard]](int) { return 1; };
+  g (1);				// { dg-warning "ignoring return value of 'foo\\\(bool, bool\\\)::<lambda\\\(int\\\)>', declared with attribute 'nodiscard'" }
+  auto h = [] [[nodiscard]] { return 0; };
+  h ();					// { dg-warning "ignoring return value of 'foo\\\(bool, bool\\\)::<lambda\\\(\\\)>', declared with attribute 'nodiscard'" }
+  auto i = [] [[ gnu::unavailable ]] () {};
+  auto j = [][[gnu::unavailable]] {};
+#if __cpp_generic_lambdas >= 201304
+  auto k = [] [[gnu::unavailable]] (auto x) {};	// { dg-bogus "is unavailable" }
+#endif
+#if __cpp_generic_lambdas >= 201707
+  auto l = [] <typename T> [[gnu::unavailable]] (T) {};	// { dg-bogus "is unavailable" }
+#endif
+}
diff --git a/gcc/testsuite/g++.dg/cpp23/lambda-attr2.C b/gcc/testsuite/g++.dg/cpp23/lambda-attr2.C
new file mode 100644
index 00000000000..0392b179b86
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp23/lambda-attr2.C
@@ -0,0 +1,19 @@
+// P2173R1 - Attributes on Lambda-Expressions
+// { dg-do compile { target c++11 } }
+
+void
+foo (bool x, bool y)
+{
+  auto i = [] [[ gnu::unavailable ]] () {};
+  i ();			// { dg-error "'foo\\\(bool, bool\\\)::<lambda\\\(\\\)>' is unavailable" }
+  auto j = [][[gnu::unavailable]] {};
+  j ();			// { dg-error "'foo\\\(bool, bool\\\)::<lambda\\\(\\\)>' is unavailable" }
+#if __cpp_generic_lambdas >= 201304
+  auto k = [] [[gnu::unavailable]] (auto x) {};	// { dg-bogus "is unavailable" }
+  k (0.0);		// { dg-error "'foo\\\(bool, bool\\\)::<lambda\\\(auto:1\\\)>\[^\n\r]*' is unavailable" "" { target c++14 } }
+#endif
+#if __cpp_generic_lambdas >= 201707
+  auto l = [] <typename T> [[gnu::unavailable]] (T) {};	// { dg-bogus "is unavailable" }
+  l (1);		// { dg-error "'foo\\\(bool, bool\\\)::<lambda\\\(T\\\)>\[^\n\r]*' is unavailable" "" { target c++20 } }
+#endif
+}


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-05-06  9:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-06  9:57 [gcc r12-8346] c++: Don't emit deprecated warnings or unavailable errors on lambda declarations Jakub Jelinek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).