decl.c (grokfndecl): Remove old bison hack.

2013-08-27  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokfndecl): Remove old bison hack.

From-SVN: r202017

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c110d9193a13b375f47b4c08f8833fdbca17376a..98d007e5f203707919f6f99371d611f865ed6d6b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-27  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * decl.c (grokfndecl): Remove old bison hack.
+
 2013-08-26  Jan Hubicka  <jh@suse.cz>
 
        * cp-tree.h (DECL_CONSTRUCTOR_P, DECL_DESTRUCTOR_P): Use

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 95d5bbda785e53ec6c6915abc06df5ce3776fa7e..4076a24cf6af34f35da914d81c5bd7f0b430e17e 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7427,17 +7427,6 @@ grokfndecl (tree ctype,
             the information in the TEMPLATE_ID_EXPR.  */
          SET_DECL_IMPLICIT_INSTANTIATION (decl);
 
-         if (TREE_CODE (fns) == COMPONENT_REF)
-           {
-             /* Due to bison parser ickiness, we will have already looked
-                up an operator_name or PFUNCNAME within the current class
-                (see template_id in parse.y). If the current class contains
-                such a name, we'll get a COMPONENT_REF here. Undo that.  */
-
-             gcc_assert (TREE_TYPE (TREE_OPERAND (fns, 0))
-                         == current_class_type);
-             fns = TREE_OPERAND (fns, 1);
-           }
          gcc_assert (identifier_p (fns) || TREE_CODE (fns) == OVERLOAD);
          DECL_TEMPLATE_INFO (decl) = build_template_info (fns, args);