From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Wed, 18 Oct 2023 12:31:53 +0000 (+0200)
Subject: gccrs: Parse variadic functions
X-Git-Tag: basepoints/gcc-15~2013
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ac7d47338bb8c34f3751be77be05fa9ca456921;p=thirdparty%2Fgcc.git

gccrs: Parse variadic functions

Variadic functions were not parsed because it is an unstable feature.
While it is still unstable, it is required in order to parse libcore.

gcc/rust/ChangeLog:

	* parse/rust-parse-impl.h (Parser::parse_function_param): Parse
	variadic functions.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index eb0310c888f7..61c915db9972 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -3584,6 +3584,13 @@ Parser<ManagedTokenSource>::parse_function_param ()
 
   // TODO: should saved location be at start of outer attributes or pattern?
   location_t locus = lexer.peek_token ()->get_locus ();
+
+  if (lexer.peek_token ()->get_id () == ELLIPSIS) // Unnamed variadic
+    {
+      lexer.skip_token (); // Skip ellipsis
+      return AST::FunctionParam (std::move (outer_attrs), locus);
+    }
+
   std::unique_ptr<AST::Pattern> param_pattern = parse_pattern ();
 
   // create error function param if it doesn't exist
@@ -3599,15 +3606,24 @@ Parser<ManagedTokenSource>::parse_function_param ()
       return AST::FunctionParam::create_error ();
     }
 
-  std::unique_ptr<AST::Type> param_type = parse_type ();
-  if (param_type == nullptr)
+  if (lexer.peek_token ()->get_id () == ELLIPSIS) // Named variadic
     {
-      // skip?
-      return AST::FunctionParam::create_error ();
+      lexer.skip_token (); // Skip ellipsis
+      return AST::FunctionParam (std::move (param_pattern),
+				 std::move (outer_attrs), locus);
+    }
+  else
+    {
+      std::unique_ptr<AST::Type> param_type = parse_type ();
+      if (param_type == nullptr)
+	{
+	  // skip?
+	  return AST::FunctionParam::create_error ();
+	}
+      return AST::FunctionParam (std::move (param_pattern),
+				 std::move (param_type),
+				 std::move (outer_attrs), locus);
     }
-
-  return AST::FunctionParam (std::move (param_pattern), std::move (param_type),
-			     std::move (outer_attrs), locus);
 }
 
 /* Parses a function or method return type syntactical construction. Also