re PR c++/10126 (ICE in convert_nontype_argument on using overload resolution in...

	PR c++/10126
	* pt.c (convert_nontype_argument): Handle default conversions
	while converting a pointer to member function.

From-SVN: r74184

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 972396880d0abc897c48462b853dc9954685b0ab..7b7f63a665005748b1f21a12353d49b14c5244cc 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-02  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
+
+       PR c++/10126\r
+       * pt.c (convert_nontype_argument): Handle default conversions\r
+       while converting a pointer to member function.\r
+
 2003-12-02  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
        PR c++/12573\r

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 93d790bc818a8b18f81a1d0bc8c7d37e64462502..33c2589fdf1f02a54710b181cfc0e14c7814493a 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3440,8 +3440,9 @@ convert_nontype_argument (tree type, tree expr)
        if (expr == error_mark_node)
          return error_mark_node;
 
-       my_friendly_assert (same_type_p (type, TREE_TYPE (expr)),
-                           0);
+       if (!same_type_p (type, TREE_TYPE (expr)))
+         return error_mark_node;
+
        return expr;
       }
       break;