lookup_name, redux
Richard Henderson
rth@redhat.com
Mon Nov 21 21:35:00 GMT 2005
Unlike GeoffK, I see absolutely no need for a langhook here. There
are quite a number of functions that are used by c-common.c that are
implemented specially by name between the C and C++ front ends; I see
no reason to single this one out for special treatment. More, langhooks
are things that are part of the interface to *all* front ends, which
IMO doesn't make sense in this case.
I'm reverting Mike's patch in favour of the solution I used on the
gomp branch when I discovered the problem.
In addition to not polluting the langhooks with things that don't
belong, I believe this has readability benefits in the C++ front end.
The magic zero argument is gone on several instances, and it gets
named in those that remain.
Bootstrapped and tested on i686-linux.
r~
gcc/
* c-common.c, config/darwin-c.c, c-decl.c, c-tree.h, c-objc-common.h,
langhooks-def.h, langhooks.h: Revert 2005-11-18 lookup_name patch.
* c-tree.h (lookup_name): Move declaration ...
* c-common.h (lookup_name): ... here.
* config/darwin-c.c: Include c-common.h.
* config/t-darwin: Update dependencies.
gcc/cp/
* cp-objcp-common.h, name-lookup.c, name-lookup.h: Revert 11-18 patch.
* name-lookup.c (lookup_name): Remove prefer_type argument.
(lookup_name_prefer_type): New.
* decl.c (lookup_and_check_tag): Use them.
* pt.c (tsubst_friend_class): Likewise.
(lookup_template_class): Likewise.
(tsubst_copy_and_build): Likewise.
* name-lookup.h (lookup_name_prefer_type): New.
(lookup_name): Remove declaration.
Index: cp/decl.c
===================================================================
--- cp/decl.c (revision 107324)
+++ cp/decl.c (working copy)
@@ -9293,7 +9293,7 @@ lookup_and_check_tag (enum tag_types tag
{
/* First try ordinary name lookup, ignoring hidden class name
injected via friend declaration. */
- decl = lookup_name (name, 2);
+ decl = lookup_name_prefer_type (name, 2);
/* If that fails, the name will be placed in the smallest
non-class, non-function-prototype scope according to 3.3.1/5.
We may already have a hidden name declared as friend in this
Index: cp/cp-objcp-common.h
===================================================================
--- cp/cp-objcp-common.h (revision 107324)
+++ cp/cp-objcp-common.h (working copy)
@@ -151,7 +151,5 @@ extern tree objcp_tsubst_copy_and_build
#define LANG_HOOKS_TO_TARGET_CHARSET c_common_to_target_charset
#undef LANG_HOOKS_GIMPLIFY_EXPR
#define LANG_HOOKS_GIMPLIFY_EXPR cp_gimplify_expr
-#undef LANG_HOOKS_LOOKUP_NAME
-#define LANG_HOOKS_LOOKUP_NAME lookup_name_one
#endif /* GCC_CP_OBJCP_COMMON */
Index: cp/pt.c
===================================================================
--- cp/pt.c (revision 107324)
+++ cp/pt.c (working copy)
@@ -4352,7 +4352,7 @@ lookup_template_class (tree d1,
{
if (context)
push_decl_namespace (context);
- template = lookup_name (d1, /*prefer_type=*/0);
+ template = lookup_name (d1);
template = maybe_get_template_decl_from_type_decl (template);
if (context)
pop_decl_namespace ();
@@ -5384,7 +5384,7 @@ tsubst_friend_class (tree friend_tmpl, t
}
/* First, we look for a class template. */
- tmpl = lookup_name (DECL_NAME (friend_tmpl), /*prefer_type=*/0);
+ tmpl = lookup_name (DECL_NAME (friend_tmpl));
/* But, if we don't find one, it might be because we're in a
situation like this:
@@ -5399,7 +5399,7 @@ tsubst_friend_class (tree friend_tmpl, t
for `S<int>', not the TEMPLATE_DECL. */
if (!tmpl || !DECL_CLASS_TEMPLATE_P (tmpl))
{
- tmpl = lookup_name (DECL_NAME (friend_tmpl), /*prefer_type=*/1);
+ tmpl = lookup_name_prefer_type (DECL_NAME (friend_tmpl), 1);
tmpl = maybe_get_template_decl_from_type_decl (tmpl);
}
@@ -8516,7 +8516,7 @@ tsubst_copy_and_build (tree t,
}
/* Look up the name. */
- decl = lookup_name (t, 0);
+ decl = lookup_name (t);
/* By convention, expressions use ERROR_MARK_NODE to indicate
failure, not NULL_TREE. */
Index: cp/name-lookup.c
===================================================================
--- cp/name-lookup.c (revision 107324)
+++ cp/name-lookup.c (working copy)
@@ -3998,18 +3998,16 @@ lookup_function_nonclass (tree name, tre
}
tree
-lookup_name (tree name, int prefer_type)
+lookup_name (tree name)
{
- return lookup_name_real (name, prefer_type, 0, /*block_p=*/true,
- 0, LOOKUP_COMPLAIN);
+ return lookup_name_real (name, 0, 0, /*block_p=*/true, 0, LOOKUP_COMPLAIN);
}
-/* Similar to `lookup_name' for the benefit of common code. */
-
tree
-lookup_name_one (tree name)
+lookup_name_prefer_type (tree name, int prefer_type)
{
- return lookup_name (name, 0);
+ return lookup_name_real (name, prefer_type, 0, /*block_p=*/true,
+ 0, LOOKUP_COMPLAIN);
}
/* Look up NAME for type used in elaborated name specifier in
Index: cp/name-lookup.h
===================================================================
--- cp/name-lookup.h (revision 107324)
+++ cp/name-lookup.h (working copy)
@@ -312,8 +312,7 @@ extern void pop_nested_namespace (tree);
extern void pushlevel_class (void);
extern void poplevel_class (void);
extern tree pushdecl_with_scope (tree, cxx_scope *, bool);
-extern tree lookup_name (tree, int);
-extern tree lookup_name_one (tree);
+extern tree lookup_name_prefer_type (tree, int);
extern tree lookup_name_real (tree, int, int, bool, int, int);
extern tree lookup_type_scope (tree, tag_scope);
extern tree namespace_binding (tree, tree);
Index: c-objc-common.h
===================================================================
--- c-objc-common.h (revision 107324)
+++ c-objc-common.h (working copy)
@@ -127,8 +127,6 @@ extern void c_initialize_diagnostics (di
#undef LANG_HOOKS_GETDECLS
#define LANG_HOOKS_GETDECLS lhd_return_null_tree_v
-#undef LANG_HOOKS_LOOKUP_NAME
-#define LANG_HOOKS_LOOKUP_NAME lookup_name
#undef LANG_HOOKS_WRITE_GLOBALS
#define LANG_HOOKS_WRITE_GLOBALS c_write_global_declarations
Index: c-tree.h
===================================================================
--- c-tree.h (revision 107324)
+++ c-tree.h (working copy)
@@ -454,7 +454,6 @@ extern tree groktypename (struct c_type_
extern tree grokparm (const struct c_parm *);
extern tree implicitly_declare (tree);
extern void keep_next_level (void);
-extern tree lookup_name (tree);
extern void pending_xref_error (void);
extern void c_push_function_context (struct function *);
extern void c_pop_function_context (struct function *);
Index: langhooks.h
===================================================================
--- langhooks.h (revision 107324)
+++ langhooks.h (working copy)
@@ -170,12 +170,6 @@ struct lang_hooks_for_decls
/* Returns the chain of decls so far in the current scope level. */
tree (*getdecls) (void);
-/* Look up NAME in the current scope and its superiors
- in the namespace of variables, functions and typedefs.
- Return a ..._DECL node of some kind representing its definition,
- or return 0 if it is undefined. */
- tree (*lookup_name) (tree);
-
/* Returns true when we should warn for an unused global DECL.
We will already have checked that it has static binding. */
bool (*warn_unused_global) (tree);
Index: c-common.c
===================================================================
--- c-common.c (revision 107324)
+++ c-common.c (working copy)
@@ -5464,7 +5464,7 @@ handle_cleanup_attribute (tree *node, tr
*no_add_attrs = true;
return NULL_TREE;
}
- cleanup_decl = lang_hooks.decls.lookup_name (cleanup_id);
+ cleanup_decl = lookup_name (cleanup_id);
if (!cleanup_decl || TREE_CODE (cleanup_decl) != FUNCTION_DECL)
{
error ("cleanup argument not a function");
Index: c-common.h
===================================================================
--- c-common.h (revision 107324)
+++ c-common.h (working copy)
@@ -776,6 +776,7 @@ extern tree finish_label_address_expr (t
/* Same function prototype, but the C and C++ front ends have
different implementations. Used in c-common.c. */
extern tree lookup_label (tree);
+extern tree lookup_name (tree);
extern int vector_types_convertible_p (tree t1, tree t2);
Index: config/t-darwin
===================================================================
--- config/t-darwin (revision 107324)
+++ config/t-darwin (working copy)
@@ -6,7 +6,7 @@ darwin.o: $(srcdir)/config/darwin.c $(CO
darwin-c.o: $(srcdir)/config/darwin-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
$(TM_H) $(CPPLIB_H) tree.h c-pragma.h $(C_TREE_H) toplev.h $(TM_P_H) \
- c-incpath.h flags.h
+ c-incpath.h flags.h $(C_COMMON_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/darwin-c.c $(PREPROCESSOR_DEFINES)
gt-darwin.h : s-gtype ; @true
Index: config/darwin-c.c
===================================================================
--- config/darwin-c.c (revision 107324)
+++ config/darwin-c.c (working copy)
@@ -28,12 +28,12 @@ Boston, MA 02110-1301, USA. */
#include "c-pragma.h"
#include "c-tree.h"
#include "c-incpath.h"
+#include "c-common.h"
#include "toplev.h"
#include "flags.h"
#include "tm_p.h"
#include "cppdefault.h"
#include "prefix.h"
-#include "langhooks.h"
/* Pragmas. */
@@ -142,7 +142,7 @@ darwin_pragma_unused (cpp_reader *pfile
tok = c_lex (&decl);
if (tok == CPP_NAME && decl)
{
- tree local = lang_hooks.decls.lookup_name (decl);
+ tree local = lookup_name (decl);
if (local && (TREE_CODE (local) == PARM_DECL
|| TREE_CODE (local) == VAR_DECL))
TREE_USED (local) = 1;
Index: langhooks-def.h
===================================================================
--- langhooks-def.h (revision 107324)
+++ langhooks-def.h (working copy)
@@ -234,7 +234,6 @@ extern tree lhd_make_node (enum tree_cod
#define LANG_HOOKS_INSERT_BLOCK insert_block
#define LANG_HOOKS_PUSHDECL pushdecl
#define LANG_HOOKS_GETDECLS getdecls
-#define LANG_HOOKS_LOOKUP_NAME lhd_return_null_tree
#define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL lhd_warn_unused_global_decl
#define LANG_HOOKS_WRITE_GLOBALS write_global_declarations
#define LANG_HOOKS_PREPARE_ASSEMBLE_VARIABLE NULL
@@ -246,7 +245,6 @@ extern tree lhd_make_node (enum tree_cod
LANG_HOOKS_INSERT_BLOCK, \
LANG_HOOKS_PUSHDECL, \
LANG_HOOKS_GETDECLS, \
- LANG_HOOKS_LOOKUP_NAME, \
LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL, \
LANG_HOOKS_WRITE_GLOBALS, \
LANG_HOOKS_PREPARE_ASSEMBLE_VARIABLE, \
More information about the Gcc-patches
mailing list