[gcc/devel/c++-modules] Missed commit

[gcc/devel/c++-modules] Missed commit

[Nathan Sidwell]

https://gcc.gnu.org/g:437d6ec6cc7ebf6059a0f33962167894986f6c72

commit 437d6ec6cc7ebf6059a0f33962167894986f6c72
Author: Nathan Sidwell <nathan@acm.org>
Date:   Thu Oct 1 11:23:35 2020 -0700

    Missed commit

Diff:
---
 gcc/cp/name-lookup.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 4c83b894478..fe23a126edf 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -278,11 +278,11 @@ get_fixed_binding_slot (tree *slot, tree name, unsigned ix, int create)
 		   || TREE_CODE (not_tmpl) == VAR_DECL)
 		  && DECL_THIS_STATIC (not_tmpl))
 		/* Internal linkage.  */
+		// FIXME: Is this right given the new header-unit
+		// meaning?
 		continue;
 
-	      if (!iter.hidden_p ()
-		  || DECL_HIDDEN_FRIEND_P (decl))
-		init_global_partition (cluster, decl);
+	      init_global_partition (cluster, decl);
 	    }
 
 	  if (cluster[0].slots[MODULE_SLOT_GLOBAL]
@@ -8057,10 +8057,6 @@ lookup_elaborated_type_1 (tree name, TAG_how how)
 		      DECL_ANTICIPATED (tmpl) = false;
 		      DECL_FRIEND_P (tmpl) = false;
 		    }
-#if 0
-		  if (flag_modules)
-		    set_instantiating_module (found);
-#endif
 		}
 	      return found;
 	    }