From 3c1cf7350bff6ba03faaa61b44d74bf8a06c6543 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 21 Jan 2021 04:48:39 -0800
Subject: [PATCH] c++: Stat-hack for members [PR 98530]

This was a header file that deployed the stat-hack inside a class
(both a member-class and a [non-static data] member had the same
name).  Due to the way that's represented in name lookup we missed the
class.  Sadly just changing the representation globally has
detrimental effects elsewhere, and this is a rare case, so just
creating a new overload on the fly shouldn't be a problem.

	PR c++/98530
	gcc/cp/
	* name-lookup.c (lookup_class_binding): Rearrange a stat-hack.
	gcc/testsuite/
	* g++.dg/modules/stat-mem-1.h: New.
	* g++.dg/modules/stat-mem-1_a.H: New.
	* g++.dg/modules/stat-mem-1_b.C: New.
---
 gcc/cp/name-lookup.c                        | 11 ++++++++---
 gcc/testsuite/g++.dg/modules/stat-mem-1.h   |  6 ++++++
 gcc/testsuite/g++.dg/modules/stat-mem-1_a.H |  5 +++++
 gcc/testsuite/g++.dg/modules/stat-mem-1_b.C |  4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/modules/stat-mem-1.h
 create mode 100644 gcc/testsuite/g++.dg/modules/stat-mem-1_a.H
 create mode 100644 gcc/testsuite/g++.dg/modules/stat-mem-1_b.C

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 843e5f305c0..0fb0036c4f3 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -3926,11 +3926,16 @@ lookup_class_binding (tree klass, tree name)
       vec<tree, va_gc> *member_vec = CLASSTYPE_MEMBER_VEC (klass);
 
       found = member_vec_binary_search (member_vec, name);
-      if (IDENTIFIER_CONV_OP_P (name))
+      if (!found)
+	;
+      else if (STAT_HACK_P (found))
+	/* Rearrange the stat hack so that we don't need to expose that
+	   internal detail.  */
+	found = ovl_make (STAT_TYPE (found), STAT_DECL (found));
+      else if (IDENTIFIER_CONV_OP_P (name))
 	{
 	  gcc_checking_assert (name == conv_op_identifier);
-	  if (found)
-	    found = OVL_CHAIN (found);
+	  found = OVL_CHAIN (found);
 	}
     }
   else
diff --git a/gcc/testsuite/g++.dg/modules/stat-mem-1.h b/gcc/testsuite/g++.dg/modules/stat-mem-1.h
new file mode 100644
index 00000000000..b5703ea2262
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/stat-mem-1.h
@@ -0,0 +1,6 @@
+
+struct fpu {
+  struct NAME {
+    int state;
+  } NAME;
+};
diff --git a/gcc/testsuite/g++.dg/modules/stat-mem-1_a.H b/gcc/testsuite/g++.dg/modules/stat-mem-1_a.H
new file mode 100644
index 00000000000..6daa137be4f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/stat-mem-1_a.H
@@ -0,0 +1,5 @@
+// { dg-additional-options -fmodule-header }
+// PR c++ 98530  stat-hack inside a structure
+// { dg-module-cmi {} }
+
+#include "stat-mem-1.h"
diff --git a/gcc/testsuite/g++.dg/modules/stat-mem-1_b.C b/gcc/testsuite/g++.dg/modules/stat-mem-1_b.C
new file mode 100644
index 00000000000..9b83d4e6e30
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/stat-mem-1_b.C
@@ -0,0 +1,4 @@
+// { dg-additional-options "-fmodules-ts -fno-module-lazy" }
+
+#include "stat-mem-1.h"
+import "stat-mem-1_a.H";