Patchwork [C++] Remove old bison hack?!

login
register
mail settings
Submitter Paolo Carlini
Date Aug. 26, 2013, 8:50 p.m.
Message ID <521BBF94.5040901@oracle.com>
Download mbox | patch
Permalink /patch/269976/
State New
Headers show

Comments

Paolo Carlini - Aug. 26, 2013, 8:50 p.m.
Hi,

a few days ago I noticed this comment and code. Removing it passes 
testing on x86_64-linux (I would in any case also boot and test multilib 
before committing).

Admittedly, a bit risky, but Stage 1 seems the right time to try.

Thanks!
Paolo.

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

	* decl.c (grokfndecl): Remove old bison hack.
Jason Merrill - Aug. 27, 2013, 12:59 a.m.
OK.

Jason

Patch

Index: decl.c
===================================================================
--- decl.c	(revision 202008)
+++ decl.c	(working copy)
@@ -7427,17 +7449,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);