feedback

Author: zyn0217

clang/docs/ReleaseNotes.rst

@@ -767,7 +767,7 @@ Bug Fixes to C++ Support
 - Clang could incorrectly instantiate functions in discarded contexts (#GH140449)
 - Fix instantiation of default-initialized variable template specialization. (#GH140632) (#GH140622)
 - Clang modules now allow a module and its user to differ on TrivialAutoVarInit*
-- Fixed a C++20 access checking bug when initializing non-aggregates in default arguments (#GH83608)
+- Fixed an access checking bug when initializing non-aggregates in default arguments (#GH62444), (#GH83608)
 
 Bug Fixes to AST Handling
 ^^^^^^^^^^^^^^^^^^^^^^^^^

clang/test/SemaCXX/access-control-check.cpp

@@ -13,3 +13,49 @@ class N : M,P {
   N() {}
   int PR() { return iP + PPR(); } // expected-error 2 {{private member of 'P'}}
 };
+
+namespace GH83608 {
+
+class single;
+
+class check_constructible {
+  // This makes the class a non-aggregate, which enforces us to check
+  // the constructor when initializing.
+  check_constructible() {}
+
+  friend class single;
+};
+
+struct single {
+  template <class T> single(T u, check_constructible = {}) {}
+};
+
+// We perform access checking when substituting into the default argument.
+// Make sure it runs within the context of 'single'.
+single x(0);
+
+}
+
+namespace GH62444 {
+
+struct B {
+  friend struct A;
+private:
+  B(int); // #B
+};
+
+template<class T>
+int f(T = 0); // #Decl
+
+struct A {
+  A() {
+    int i = f<B>();
+    // expected-error@#Decl {{calling a private constructor}}
+    // expected-note@-2 {{in instantiation of default function argument}}
+    // expected-note@#B {{declared private}}
+  }
+};
+
+int i = f<B>();
+
+}

clang/test/SemaTemplate/default-arguments.cpp

@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s
 // RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++20 %s
 template<typename T, int N = 2> struct X; // expected-note{{template is declared here}}
 
 X<int, 1> *x1;
@@ -283,25 +282,4 @@ static_assert(S<short *>().SizeOfT<char>() == sizeof(short *), "");
 
 } // namespace GH68490
 
-namespace GH83608 {
-
-class single;
-
-class check_constructible {
-  // This makes it a non-aggregate in C++20+.
-  check_constructible() = default;
-
-  friend class single;
-};
-
-struct single {
-  template <class T> single(T u, check_constructible = {}) {}
-};
-
-// We perform access checking when substituting into the default argument.
-// Make sure it runs within class single.
-single x(0);
-
-}
-
 #endif