From 681ba2f7681f295a102cd63ffd5ce2b86a5f706e Mon Sep 17 00:00:00 2001
From: Patrick Palka <ppalka@redhat.com>
Date: Sun, 7 May 2023 10:24:52 -0400
Subject: [PATCH] c++: non-dep init folding and access checking [PR109480]

enforce_access currently checks processing_template_decl to decide
whether to defer the given access check until instantiation time.
But using this flag is unreliable because it gets cleared during e.g.
non-dependent initializer folding, and so can lead to premature access
check failures as in the below testcase.  It seems better to check
current_template_parms instead.

	PR c++/109480

gcc/cp/ChangeLog:

	* semantics.cc (enforce_access): Check current_template_parms
	instead of processing_template_decl when deciding whether to
	defer the access check.

gcc/testsuite/ChangeLog:

	* g++.dg/template/non-dependent25a.C: New test.
---
 gcc/cp/semantics.cc                             |  2 +-
 .../g++.dg/template/non-dependent25a.C          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/non-dependent25a.C

diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 9ba316ab3be4..474da71bff62 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -346,7 +346,7 @@ enforce_access (tree basetype_path, tree decl, tree diag_decl,
     }
 
   tree cs = current_scope ();
-  if (processing_template_decl
+  if (current_template_parms
       && (CLASS_TYPE_P (cs) || TREE_CODE (cs) == FUNCTION_DECL))
     if (tree template_info = get_template_info (cs))
       {
diff --git a/gcc/testsuite/g++.dg/template/non-dependent25a.C b/gcc/testsuite/g++.dg/template/non-dependent25a.C
new file mode 100644
index 000000000000..902e537ec09e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/non-dependent25a.C
@@ -0,0 +1,17 @@
+// PR c++/109480
+// A version of non-dependent25.C where b's initializer is a constant
+// expression.
+// { dg-do compile { target c++11 } }
+
+template<class T>
+struct A {
+  void f() {
+    constexpr A<int> a;
+    const bool b = a.g(); // { dg-bogus "private" }
+  }
+
+private:
+  constexpr bool g() const { return true; }
+};
+
+template struct A<int>;
-- 
2.47.2