OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/15285 (instantiate_type ICE when forming pointer to template function) 

PR c++/15285
	PR c++/15299
	* pt.c (build_non_dependent_expr): Expand the set of tree nodes
	recognized as overloaded functions.

	PR c++/15285
	PR c++/15299
	* g++.dg/template/non-dependent5.C: New test.
	* g++.dg/template/non-dependent6.C: New test.

From-SVN: r82149
This commit is contained in:
Mark Mitchell 2004-05-22 21:45:24 +00:00 committed by Mark Mitchell
parent 52ceb03971
commit 0deb916ce9
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2004-05-22 Mark Mitchell <mark@codesourcery.com>
PR c++/15285
PR c++/15299
* pt.c (build_non_dependent_expr): Expand the set of tree nodes
recognized as overloaded functions.
2004-05-22 Mark Mitchell <mark@codesourcery.com>
PR c++/15507

11
gcc/cp/pt.c
View File

@ -12158,15 +12158,20 @@ resolve_typename_type (tree type, bool only_current_p)
tree
build_non_dependent_expr (tree expr)
{
tree inner_expr;
/* Preserve null pointer constants so that the type of things like
"p == 0" where "p" is a pointer can be determined. */
if (null_ptr_cst_p (expr))
return expr;
/* Preserve OVERLOADs; the functions must be available to resolve
types. */
if (TREE_CODE (expr) == OVERLOAD
|| TREE_CODE (expr) == FUNCTION_DECL
|| TREE_CODE (expr) == TEMPLATE_DECL)
inner_expr = (TREE_CODE (expr) == ADDR_EXPR ?
TREE_OPERAND (expr, 0) : expr);
if (TREE_CODE (inner_expr) == OVERLOAD
|| TREE_CODE (inner_expr) == FUNCTION_DECL
|| TREE_CODE (inner_expr) == TEMPLATE_DECL
|| TREE_CODE (inner_expr) == TEMPLATE_ID_EXPR)
return expr;
/* Preserve string constants; conversions from string constants to
"char *" are allowed, even though normally a "const char *"

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2004-05-22 Mark Mitchell <mark@codesourcery.com>
PR c++/15285
PR c++/15299
* g++.dg/template/non-dependent5.C: New test.
* g++.dg/template/non-dependent6.C: New test.
2004-05-22 Mark Mitchell <mark@codesourcery.com>
PR c++/15507

8
gcc/testsuite/g++.dg/template/non-dependent5.C Normal file
View File

@ -0,0 +1,8 @@
// PR c++/15299
template <class T> void fun_ptr(T (*)());
template <class T> T bar();
template <class> void foo () {
fun_ptr(bar<int>);
}

13
gcc/testsuite/g++.dg/template/non-dependent6.C Normal file
View File

@ -0,0 +1,13 @@
// PR c++/15285
void foo(void (*func)()) {}
template<typename T>
void bar()
{}
template<typename T>
void baz()
{
foo(&bar<long>);
}