removing inherited from c-common

Author: NinaRanns

gcc/c-family/c-common.cc

@@ -516,6 +516,7 @@ const struct c_common_resword c_common_reswords[] =
   { "constinit",	RID_CONSTINIT,	D_CXXONLY | D_CXX20 | D_CXXWARN },
   { "const_cast",	RID_CONSTCAST,	D_CXXONLY | D_CXXWARN },
   { "continue",		RID_CONTINUE,	0 },
+  { "contract_assert",	RID_CONTASSERT,	D_CXXONLY | D_CXXWARN }, // removed D_CXX20 in order for contracts to work out of the box
   { "decltype",         RID_DECLTYPE,   D_CXXONLY | D_CXX11 | D_CXXWARN },
   { "default",		RID_DEFAULT,	0 },
   { "delete",		RID_DELETE,	D_CXXONLY | D_CXXWARN },
@@ -598,10 +599,6 @@ const struct c_common_resword c_common_reswords[] =
   { "co_yield",		RID_CO_YIELD,	D_CXX_COROUTINES_FLAGS | D_CXXWARN },
   { "co_return", 	RID_CO_RETURN,	D_CXX_COROUTINES_FLAGS | D_CXXWARN },
 
-  /* Contracts-related keywords */
-  { "contract_assert",	RID_CONTASSERT,	D_CXXONLY | D_CXXWARN }, // removed D_CXX20 in order for contracts to work out of the box
-  { "inherited",	RID_INHERITED,	D_CXXONLY | D_CXXWARN },
-
   /* These Objective-C keywords are recognized only immediately after
      an '@'.  */
   { "compatibility_alias", RID_AT_ALIAS,	D_OBJC },

gcc/c-family/c-common.h

@@ -176,7 +176,7 @@ enum rid
   RID_CONSTEXPR, RID_DECLTYPE, RID_NOEXCEPT, RID_NULLPTR, RID_STATIC_ASSERT,
 
   /* C++20 */
-  RID_CONSTINIT, RID_CONSTEVAL,
+  RID_CONSTINIT, RID_CONSTEVAL, RID_CONTASSERT,
 
   /* char8_t */
   RID_CHAR8,
@@ -190,9 +190,6 @@ enum rid
   /* C++ coroutines */
   RID_CO_AWAIT, RID_CO_YIELD, RID_CO_RETURN,
 
-  /* C++ contracts */
-  RID_CONTASSERT, RID_INHERITED,
-
   /* C++ transactional memory.  */
   RID_ATOMIC_NOEXCEPT, RID_ATOMIC_CANCEL, RID_SYNCHRONIZED,
 

gcc/cp/parser.cc

@@ -31865,10 +31865,6 @@ cp_parse_inherited_contract (cp_parser *parser)
 {
   cp_token *token = cp_lexer_consume_token (parser->lexer);
   location_t loc = token->location;
-
-  gcc_checking_assert(token->type == CPP_KEYWORD
-		      && token->keyword == RID_INHERITED);
-
   matching_parens parens;
   parens.require_open (parser);
 
@@ -31877,9 +31873,10 @@ cp_parse_inherited_contract (cp_parser *parser)
       error_at (loc, "inherited contracts are only available with"
 		" %<-fcontracts-on-virtual-functions=P3653%>");
 
-      cp_parser_skip_to_closing_parenthesis_1 (parser, /*recovering=*/true,
-      					       CPP_CLOSE_PAREN,
-      					       /*consume_paren=*/true);
+      cp_parser_skip_to_closing_parenthesis (parser,
+					     /*recovering=*/true,
+					     /*or_comma=*/false,
+					     /*consume_paren=*/true);
       return error_mark_node;
     }
 
@@ -31945,7 +31942,8 @@ cp_parser_function_contract_specifier (cp_parser *parser)
 
   token = cp_lexer_peek_token (parser->lexer);
 
-  if (token->type == CPP_KEYWORD && token->keyword == RID_INHERITED)
+  if (token->type == CPP_NAME
+      && is_attribute_p ("inherited", token->u.value))
     return cp_parse_inherited_contract(parser);
 
   /* Parse experimental modifiers on C++26 contracts.  */