svn commit: r260831 - head/contrib/gcc/cp

[Pedro F. Giffuni]

Author: pfg
Date: Fri Jan 17 21:21:28 2014
New Revision: 260831
URL: http://svnweb.freebsd.org/changeset/base/260831

Log:
  gcc: Drop useless objc change from r260311.
  
  Among some of the objc changes from Apple that crept into r260311,
  Radar 5355344 is incomplete and is not used since we don't carry
  ObjC in the base system.
  
  The dead code seems to have caused issues in some Tinderboxes so
  get rid of it altogether.
  
  Reported by:	luigi
  MFC after:	9 days

Modified:
  head/contrib/gcc/cp/ChangeLog.apple
  head/contrib/gcc/cp/parser.c

Modified: head/contrib/gcc/cp/ChangeLog.apple
==============================================================================
--- head/contrib/gcc/cp/ChangeLog.apple	Fri Jan 17 17:16:49 2014	(r260830)
+++ head/contrib/gcc/cp/ChangeLog.apple	Fri Jan 17 21:21:28 2014	(r260831)
@@ -302,15 +302,6 @@
 	(cp_parser_objc_declaration): Parses attribute list and passes it down 
 	to cp_parser_objc_class_interface/cp_parser_objc_protocol_declaration.
 	
-2007-07-24  Fariborz Jahanian <fjahanian at apple.com>
-
-	 Radar 5355344
-	* cp-tree.h (cp_objc_protocol_id_list): New declaration
-	* cp-lang.c (cp_objc_protocol_id_list): New stub
-	* parser.c (cp_parser_type_name): Added code to disambiguate
-	conditional from a protocol type.
-	(cp_parser_objc_tentative_protocol_refs_opt): New
-
 2007-07-13  Fariborz Jahanian <fjahanian at apple.com>
 
 	 Radar 5277239

Modified: head/contrib/gcc/cp/parser.c
==============================================================================
--- head/contrib/gcc/cp/parser.c	Fri Jan 17 17:16:49 2014	(r260830)
+++ head/contrib/gcc/cp/parser.c	Fri Jan 17 21:21:28 2014	(r260831)
@@ -1827,10 +1827,6 @@ static tree cp_parser_objc_identifier_li
 /* APPLE LOCAL end radar 3803157 - objc attribute */
 static tree cp_parser_objc_protocol_refs_opt
   (cp_parser *);
-/* APPLE LOCAL begin radar 5355344 */
-static bool cp_parser_objc_tentative_protocol_refs_opt
-  (cp_parser *, tree *);
-/* APPLE LOCAL end radar 5355344 */
 static void cp_parser_objc_declaration
   (cp_parser *);
 static tree cp_parser_objc_statement
@@ -17873,32 +17869,6 @@ cp_parser_objc_protocol_refs_opt (cp_par
   return protorefs;
 }
 
-/* APPLE LOCAL begin radar 5355344 */
-/* This routine also parses a list of Objective-C protocol references; except that
- if list is not valid, it returns FALSE and back-tracks parsing. */
-
-static bool
-cp_parser_objc_tentative_protocol_refs_opt (cp_parser* parser, tree *protorefs)
-{
-  *protorefs = NULL_TREE;
-  if(cp_lexer_next_token_is (parser->lexer, CPP_LESS))
-    {
-      cp_parser_parse_tentatively (parser);
-      cp_lexer_consume_token (parser->lexer);  /* Eat '<'.  */
-      *protorefs = cp_parser_objc_identifier_list (parser);
-      if (!cp_objc_protocol_id_list (*protorefs))
-	 {
-	cp_parser_abort_tentative_parse (parser);
-	return false;
-	 }
-      if (cp_parser_parse_definitely (parser))
-	cp_parser_require (parser, CPP_GREATER, "`>'");
-    }
-
-  return true;
-}
-/* APPLE LOCAL end radar 5355344 */
-
 /* Parse a Objective-C visibility specification.  */
 
 static void