diff mbox series

[pushed] c++: lambda capture dependent type [PR82980]

Message ID 20220429212312.1248194-1-jason@redhat.com
State Committed
Commit 53e7252140c95afc859ade521a61ab4115d7fb11
Headers
Series [pushed] c++: lambda capture dependent type [PR82980] |

Commit Message

Jason Merrill April 29, 2022, 9:23 p.m. UTC 
  The stage 4 patch limited direct propagation of dependent type to capture
field/proxy to the "current instantiation", but many more types should be
suitable as well.

Tested x86_64-pc-linux-gnu, applying to trunk.

gcc/cp/ChangeLog:

	* lambda.cc (type_deducible_expression_p): Allow more types.
---
 gcc/cp/lambda.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


base-commit: 8189838d823ea65e560c573d38a65edc12f5c2e3
diff mbox series

Patch

diff --git a/gcc/cp/lambda.cc b/gcc/cp/lambda.cc
index 65579edc316..10834d6b143 100644
--- a/gcc/cp/lambda.cc
+++ b/gcc/cp/lambda.cc
@@ -195,10 +195,9 @@  type_deducible_expression_p (tree expr)
       || TREE_CODE (expr) == EXPR_PACK_EXPANSION)
     return false;
   tree t = non_reference (TREE_TYPE (expr));
-  if (!t) return false;
-  while (TREE_CODE (t) == POINTER_TYPE)
-    t = TREE_TYPE (t);
-  return currently_open_class (t);
+  return (t && TREE_CODE (t) != TYPE_PACK_EXPANSION
+	  && !WILDCARD_TYPE_P (t) && !LAMBDA_TYPE_P (t)
+	  && !type_uses_auto (t));
 }
 
 /* Returns the type to use for the FIELD_DECL corresponding to the