From 11729fa7a08b3b36007ab2754dad18ce73f1a69c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 27 Aug 2013 08:41:09 +0000 Subject: [PATCH] decl.c (grokfndecl): Remove old bison hack. 2013-08-27 Paolo Carlini * decl.c (grokfndecl): Remove old bison hack. From-SVN: r202017 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c110d9193a1..98d007e5f20 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2013-08-27 Paolo Carlini + + * decl.c (grokfndecl): Remove old bison hack. + 2013-08-26 Jan Hubicka * cp-tree.h (DECL_CONSTRUCTOR_P, DECL_DESTRUCTOR_P): Use diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 95d5bbda785..4076a24cf6a 100644 --- 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); -- 2.30.2