decl.c (grokdeclarator): Assert that we won't see a pointer to METHOD_TYPE.

	* decl.c (grokdeclarator): Assert that we won't see a pointer to
	METHOD_TYPE.

From-SVN: r196748

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ec7cd0f55e18d6ed43cf3690e2fcc0062f939d3b..dc094f7284874e81ed967344b001282c76aa1bbd 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-03-16  Jason Merrill  <jason@redhat.com>
 
+       * decl.c (grokdeclarator): Assert that we won't see a pointer to
+       METHOD_TYPE.
+
        PR c++/54277
        * cp-tree.h (WILDCARD_TYPE_P): Split out from...
        (MAYBE_CLASS_TYPE_P): ...here.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b67978de7c0113c35e9665841fc630270f2cbfeb..facaae7ff19c3e76709cf7deb067a62dbb7ba171 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9630,9 +9630,11 @@ grokdeclarator (const cp_declarator *declarator,
             but to the target of the pointer.  */
          type_quals = TYPE_UNQUALIFIED;
 
+         /* This code used to handle METHOD_TYPE, but I don't think it's
+            possible to get it here anymore.  */
+         gcc_assert (TREE_CODE (type) != METHOD_TYPE);
          if (declarator->kind == cdk_ptrmem
-             && (TREE_CODE (type) == FUNCTION_TYPE
-                 || (memfn_quals && TREE_CODE (type) == METHOD_TYPE)))
+             && TREE_CODE (type) == FUNCTION_TYPE)
            {
              memfn_quals |= type_memfn_quals (type);
              type = build_memfn_type (type,