decl2.c (lookup_arg_dependent): Deal with FNS not being a FUNCTION_DECL.

* decl2.c (lookup_arg_dependent): Deal with FNS not being a
	FUNCTION_DECL.

From-SVN: r31238
This commit is contained in:
Nathan Sidwell 2000-01-05 11:45:33 +00:00 committed by Nathan Sidwell
parent ac8cd718e6
commit f0b9bc6c88
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2000-01-05 Nathan Sidwell <nathan@acm.org>
* decl2.c (lookup_arg_dependent): Deal with FNS not being a
FUNCTION_DECL.
2000-01-05 Nathan Sidwell <nathan@acm.org>
* typeck.c (build_static_cast): Don't strip target qualifiers

View File

@ -1,5 +1,5 @@
/* Process declarations and variables for C compiler.
Copyright (C) 1988, 92-98, 1999 Free Software Foundation, Inc.
Copyright (C) 1988, 92-99, 2000 Free Software Foundation, Inc.
Hacked by Michael Tiemann (tiemann@cygnus.com)
This file is part of GNU CC.
@ -4822,6 +4822,7 @@ lookup_arg_dependent (name, fns, args)
tree args;
{
struct arg_lookup k;
tree fn = NULL_TREE;
k.name = name;
k.functions = fns;
@ -4829,7 +4830,9 @@ lookup_arg_dependent (name, fns, args)
/* Note that we've already looked at some namespaces during normal
unqualified lookup, unless we found a decl in function scope. */
if (fns && DECL_LOCAL_FUNCTION_P (OVL_CURRENT (fns)))
if (fns)
fn = OVL_CURRENT (fns);
if (fn && TREE_CODE (fn) == FUNCTION_DECL && DECL_LOCAL_FUNCTION_P (fn))
k.namespaces = NULL_TREE;
else
unqualified_namespace_lookup (name, 0, &k.namespaces);