re PR c++/36897 (ICE with function pointer template parameter)
commite350dbbd73b6e76f8c4e32307c759d978038c6dc
authorPaolo Bonzini <bonzini@gnu.org>
Tue, 3 Feb 2009 16:26:28 +0000 (3 16:26 +0000)
committerPaolo Bonzini <bonzini@gcc.gnu.org>
Tue, 3 Feb 2009 16:26:28 +0000 (3 16:26 +0000)
tree7693fb58c0b4076ed465a4e52b148bae94b43711
parentaa2bb640389ccc571935cc1c2b72ff9d1f237c41
re PR c++/36897 (ICE with function pointer template parameter)

gcc/cp:
2009-02-03  Paolo Bonzini  <bonzini@gnu.org>

PR c++/36897
* pt.c (convert_nontype_argument_function): Expect expr to be an
ADDR_EXPR.

PR c++/37314
* typeck.c (merge_types): Call resolve_typename_type if only
one type is a typename.

gcc/testsuite:
2009-02-03  Paolo Bonzini  <bonzini@gnu.org>

PR c++/36897
* g++.dg/template/func2.C: New test.

PR c++/37314
* g++.dg/template/typename15.C: New.
* g++.dg/template/typename16.C: New.

From-SVN: r143898
gcc/cp/ChangeLog
gcc/cp/pt.c
gcc/cp/typeck.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/template/func2.C [new file with mode: 0644]
gcc/testsuite/g++.dg/template/typename15.C [new file with mode: 0644]
gcc/testsuite/g++.dg/template/typename16.C [new file with mode: 0644]