cp-tree.h (LOOKUP_SEEN_P, [...]): New.

	gcc/cp/
	* cp-tree.h (LOOKUP_SEEN_P, LOOKUP_FOUND_P): New.
	* name-lookup.h (lookup_arg_dependent): Return plain tree.
	* name-lookup.c (arg_lookup, arg_assoc, arg_assoc_args)
	arg_assoc_args_vec, arg_assoc_type, add_function,
	arg_assoc_namespace, arg_assoc_class_only, arg_assoc_bases,
	arg_assoc_class, arg_assoc_template_arg, arg_assoc,
	lookup_arg_dependent_1): Delete.
	(name_lookup): New lookup object.
	(name_lookup::preserve_state, name_lookup::restore_state)
	name_lookup::mark_seen, name_lookup::find_and_mark,
	name_lookup::add_fns, name_lookup::adl_namespace_only,
	name_lookup::adl_namespace, name_lookup::adl_class_only,
	name_lookup::adl_bases, name_lookup::adl_class,
	name_lookup::adl_expr, name_lookup::adl_type,
	name_lookup::adl_template_arg, name_lookup::search_adl): New.
	(lookup_arg_dependent): Return a plain tree.  Adjust.
	(is_associated_namespace): Move later.
	gcc/cp/
	* g++.dg/lookup/koenig14.C: New.

From-SVN: r248457

gcc/cp/ChangeLog

+2017-05-25  Nathan Sidwell  <nathan@acm.org>
+
+	* cp-tree.h (LOOKUP_SEEN_P, LOOKUP_FOUND_P): New.
+	* name-lookup.h (lookup_arg_dependent): Return plain tree.
+	* name-lookup.c (arg_lookup, arg_assoc, arg_assoc_args,
+	arg_assoc_args_vec, arg_assoc_type, add_function,
+	arg_assoc_namespace, arg_assoc_class_only, arg_assoc_bases,
+	arg_assoc_class, arg_assoc_template_arg, arg_assoc,
+	lookup_arg_dependent_1): Delete.
+	(name_lookup): New lookup object.
+	(name_lookup::preserve_state, name_lookup::restore_state,
+	name_lookup::mark_seen, name_lookup::find_and_mark,
+	name_lookup::add_fns, name_lookup::adl_namespace_only,
+	name_lookup::adl_namespace, name_lookup::adl_class_only,
+	name_lookup::adl_bases, name_lookup::adl_class,
+	name_lookup::adl_expr, name_lookup::adl_type,
+	name_lookup::adl_template_arg, name_lookup::search_adl): New.
+	(lookup_arg_dependent): Return a plain tree.  Adjust.
+	(is_associated_namespace): Move later.
+	
 2017-05-24  Nathan Sidwell  <nathan@acm.org>
 
 	* friend.c (do_friend): Remove check for existing decl.

gcc/cp/cp-tree.h

@@ -395,6 +395,7 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX];
       DECL_TINFO_P (in VAR_DECL)
       FUNCTION_REF_QUALIFIED (in FUNCTION_TYPE, METHOD_TYPE)
       OVL_LOOKUP_P (in OVERLOAD)
+      LOOKUP_FOUND_P (in RECORD_TYPE, UNION_TYPE, NAMESPACE_DECL)
    5: C_IS_RESERVED_WORD (in IDENTIFIER_NODE)
       DECL_VTABLE_OR_VTT_P (in VAR_DECL)
       FUNCTION_RVALUE_QUALIFIED (in FUNCTION_TYPE, METHOD_TYPE)
@@ -648,10 +649,17 @@ typedef struct ptrmem_cst * ptrmem_cst_t;
     && MAIN_NAME_P (DECL_NAME (NODE))			\
     && flag_hosted)
 
-/* The overloaded FUNCTION_DECL.  */
+/* Lookup walker marking.  */
+#define LOOKUP_SEEN_P(NODE) TREE_VISITED(NODE)
+#define LOOKUP_FOUND_P(NODE) \
+  TREE_LANG_FLAG_4 (TREE_CHECK3(NODE,RECORD_TYPE,UNION_TYPE,NAMESPACE_DECL))
+
+/* These two accessors should only be used by OVL manipulators.
+   Other users should use iterators and convenience functions.  */
 #define OVL_FUNCTION(NODE) \
   (((struct tree_overload*)OVERLOAD_CHECK (NODE))->function)
 #define OVL_CHAIN(NODE)      TREE_CHAIN (NODE)
+
 /* Polymorphic access to FUNCTION and CHAIN.  */
 #define OVL_CURRENT(NODE)	\
   ((TREE_CODE (NODE) == OVERLOAD) ? OVL_FUNCTION (NODE) : (NODE))

gcc/cp/name-lookup.h

@@ -324,7 +324,7 @@ extern void pop_decl_namespace (void);
 extern void do_namespace_alias (tree, tree);
 extern tree do_class_using_decl (tree, tree);
 extern void do_using_directive (tree);
-extern cp_expr lookup_arg_dependent (tree, tree, vec<tree, va_gc> *);
+extern tree lookup_arg_dependent (tree, tree, vec<tree, va_gc> *);
 extern bool is_associated_namespace (tree, tree);
 extern tree innermost_non_namespace_value (tree);
 extern cxx_binding *outer_binding (tree, cxx_binding *, bool);

gcc/testsuite/ChangeLog

+2017-05-25  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/lookup/koenig14.C: New.
+
 2017-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/79583

gcc/testsuite/g++.dg/lookup/koenig14.C

+// ADL can be recursive (via instantiation), make sure that works.
+
+namespace X
+{
+  class B {};
+  
+  void frob ();
+  int frob (B); // Inner ADL resolves here
+}
+
+void frob (int);
+void frob (float);
+
+namespace Y
+{
+  struct A {};
+  void frob (void*, void *, void *); // Outer ADL resolves here
+}
+
+template <typename T, typename U>
+struct C : U
+{
+  int ary[sizeof frob(T())]; // ADL occurs here during instantiation
+};
+
+void Foo (C<X::B, Y::A> *p, X::B *q)
+{
+  frob(q, p, q); // ADL causes instantation of C<...>
+  // We will have already searched X by the time the instantation happens
+}