Remove a hunk duplicated during a merge.

gcc/cp/ChangeLog:
	* parser.c (cp_parser_check_class_key): Remove a duplicate hunk
	of code.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9c212d9b0a42861a6399aad12f3a2dc12ff1f41d..0cc971dc625145bafb0c7ecb917d1cd9903a0d24 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,6 +3,7 @@
        PR c++/93804
        * parser.c (cp_parser_check_class_key): Avoid issuing -Wredundant-tags
        in shared C/C++ code in headers.
+       Remove a duplicate hunk of code.
 
 2020-02-24  Marek Polacek  <polacek@redhat.com>
 

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 8e52fef70bd16c8374d7dc5d1c3134a23dae21a2..ca85d899427d3b4b33c543834eb3703c1ee5abc6 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -31021,13 +31021,6 @@ cp_parser_check_class_key (cp_parser *parser, location_t key_loc,
       && class_key != union_type)
     return;
 
-  /* Only consider the true class-keys below and ignore typename_type,
-     etc. that are not C++ class-keys.  */
-  if (class_key != class_type
-      && class_key != record_type
-      && class_key != union_type)
-    return;
-
   tree type_decl = TYPE_MAIN_DECL (type);
   tree name = DECL_NAME (type_decl);
   /* Look up the NAME to see if it unambiguously refers to the TYPE