c++/reflection: members_of and cv-qual class types [PR124215]

Here when asking for the members of "^^Test const" we found nothing.
The reason is that members_of_representable_p checks whether
CP_DECL_CONTEXT != c, but if c is a type, it doesn't look at its
TYPE_MAIN_VARIANT.  Fixed as per Jakub's suggestion in the PR.

	PR c++/124215

gcc/cp/ChangeLog:

	* reflect.cc (class_members_of): Use TYPE_MAIN_VARIANT of R.

gcc/testsuite/ChangeLog:

	* g++.dg/reflect/members_of9.C: New test.

Co-authored-by: Jakub Jelinek  <jakub@redhat.com>
Reviewed-by: Jason Merrill <jason@redhat.com>

diff --git a/gcc/cp/reflect.cc b/gcc/cp/reflect.cc
index 3c82251f511b342ee8ad6db05c25b854f3fc766e..871d52a55b119e51a5fc49547d9fffa284464d7b 100644 (file)
--- a/gcc/cp/reflect.cc
+++ b/gcc/cp/reflect.cc
@@ -6557,6 +6557,7 @@ class_members_of (location_t loc, const constexpr_ctx *ctx, tree r,
                  tree actx, tree call, bool *non_constant_p,
                  tree *jump_target, enum metafn_code kind, tree fun)
 {
+  r = TYPE_MAIN_VARIANT (r);
   if (kind == METAFN_MEMBERS_OF)
     {
       if (modules_p ())

diff --git a/gcc/testsuite/g++.dg/reflect/members_of9.C b/gcc/testsuite/g++.dg/reflect/members_of9.C
new file mode 100644 (file)
index 0000000..9d07182
--- /dev/null
+++ b/gcc/testsuite/g++.dg/reflect/members_of9.C
@@ -0,0 +1,17 @@
+// PR c++/124215
+// { dg-do compile { target c++26 } }
+// { dg-additional-options "-freflection" }
+
+#include <meta>
+
+struct Test {
+    int a;
+    char b;
+};
+
+consteval auto number_of_members(std::meta::info ty) -> size_t {
+    return nonstatic_data_members_of(ty, std::meta::access_context::current()).size();
+}
+
+static_assert(number_of_members(^^Test) == 2);
+static_assert(number_of_members(^^Test const) == 2);