[gcc r11-7632] c++: Fix unhiding friend with imports [PR 99248]

[gcc r11-7632] c++: Fix unhiding friend with imports [PR 99248]

[Nathan Sidwell]

https://gcc.gnu.org/g:5f27a9f90d4eadadf937f1a5d0bfccf39261f330

commit r11-7632-g5f27a9f90d4eadadf937f1a5d0bfccf39261f330
Author: Nathan Sidwell <nathan@acm.org>
Date:   Thu Mar 11 13:06:36 2021 -0800

    c++: Fix unhiding friend with imports [PR 99248]
    
    This was a simple thinko about which object held the reference to the
    binding vector.  I also noticed stale code in the tree dumper, as I
    recently removed the flags from a lazy number.
    
            PR c++/99248
            gcc/cp/
            * name-lookup.c (lookup_elaborated_type_1): Access slot not bind
            when there's a binding vector.
            * ptree.c (cxx_print_xnode): Lazy flags are no longer a thing.
            gcc/testsuite/
            * g++.dg/modules/pr99248.h: New.
            * g++.dg/modules/pr99248_a.H: New.
            * g++.dg/modules/pr99248_b.H: New.

Diff:
---
 gcc/cp/name-lookup.c                     | 2 +-
 gcc/cp/ptree.c                           | 3 +--
 gcc/testsuite/g++.dg/modules/pr99248.h   | 5 +++++
 gcc/testsuite/g++.dg/modules/pr99248_a.H | 5 +++++
 gcc/testsuite/g++.dg/modules/pr99248_b.H | 7 +++++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 28271ba0485..d8839e29fe5 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -7940,7 +7940,7 @@ lookup_elaborated_type_1 (tree name, TAG_how how)
 			  if (*slot == bind)
 			    *slot = decl;
 			  else
-			    BINDING_VECTOR_CLUSTER (bind, 0)
+			    BINDING_VECTOR_CLUSTER (*slot, 0)
 			      .slots[BINDING_SLOT_CURRENT] = decl;
 			}
 		    }
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index e06fe6f72c1..95a4fdf284a 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -310,8 +310,7 @@ cxx_print_xnode (FILE *file, tree node, int indent)
 		    {
 		      indent_to (file, indent + 4);
 		      unsigned lazy = slot.get_lazy ();
-		      fprintf (file, "%s snum:%u flags:%d",
-			       pfx, lazy >> 2, lazy & 3);
+		      fprintf (file, "%s snum:%u", pfx, lazy);
 		    }
 		  else if (slot)
 		    print_node (file, pfx, slot, indent + 4);
diff --git a/gcc/testsuite/g++.dg/modules/pr99248.h b/gcc/testsuite/g++.dg/modules/pr99248.h
new file mode 100644
index 00000000000..89d8dd5b39e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99248.h
@@ -0,0 +1,5 @@
+class locale
+{
+  template<typename _Cache>
+  friend struct __use_cache;
+};
diff --git a/gcc/testsuite/g++.dg/modules/pr99248_a.H b/gcc/testsuite/g++.dg/modules/pr99248_a.H
new file mode 100644
index 00000000000..7f3fddad3bc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99248_a.H
@@ -0,0 +1,5 @@
+// PR 99248 ICE with friend
+// { dg-additional-options -fmodule-header }
+// { dg-module-cmi {} }
+#include "pr99248.h"
+
diff --git a/gcc/testsuite/g++.dg/modules/pr99248_b.H b/gcc/testsuite/g++.dg/modules/pr99248_b.H
new file mode 100644
index 00000000000..33e242d4014
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99248_b.H
@@ -0,0 +1,7 @@
+// { dg-additional-options -fmodule-header }
+// { dg-module-cmi {} }
+#include "pr99248.h"
+import "pr99248_a.H";
+
+template<typename _Facet>
+struct __use_cache;