From 50c9ea9121629fc415700aa0b343b87247cc2a89 Mon Sep 17 00:00:00 2001
From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Thu, 23 Jan 2025 11:42:38 +0000
Subject: [PATCH] gccrs: ast: builder: Add Return expression builder

gcc/rust/ChangeLog:

	* ast/rust-ast-builder.h: Declare it.
	* ast/rust-ast-builder.cc (Builder::return_expr): Define it.
---
 gcc/rust/ast/rust-ast-builder.cc | 7 +++++++
 gcc/rust/ast/rust-ast-builder.h  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/gcc/rust/ast/rust-ast-builder.cc b/gcc/rust/ast/rust-ast-builder.cc
index 3a3181f3752..aef0e110ce0 100644
--- a/gcc/rust/ast/rust-ast-builder.cc
+++ b/gcc/rust/ast/rust-ast-builder.cc
@@ -276,6 +276,13 @@ Builder::block (std::vector<std::unique_ptr<Stmt>> &&stmts,
 					       LoopLabel::error (), loc, loc));
 }
 
+std::unique_ptr<Expr>
+Builder::return_expr (std::unique_ptr<Expr> &&to_return)
+{
+  return std::unique_ptr<Expr> (
+    new ReturnExpr (std::move (to_return), {}, loc));
+}
+
 std::unique_ptr<Stmt>
 Builder::let (std::unique_ptr<Pattern> pattern, std::unique_ptr<Type> type,
 	      std::unique_ptr<Expr> init) const
diff --git a/gcc/rust/ast/rust-ast-builder.h b/gcc/rust/ast/rust-ast-builder.h
index 9c5c1645eb9..90a878791df 100644
--- a/gcc/rust/ast/rust-ast-builder.h
+++ b/gcc/rust/ast/rust-ast-builder.h
@@ -89,6 +89,10 @@ public:
 			       std::unique_ptr<Expr> &&tail_expr
 			       = nullptr) const;
 
+  /* Create an early return expression with an optional expression */
+  std::unique_ptr<Expr> return_expr (std::unique_ptr<Expr> &&to_return
+				     = nullptr);
+
   /* Create a let binding with an optional type and initializer (`let <name> :
    * <type> = <init>`) */
   std::unique_ptr<Stmt> let (std::unique_ptr<Pattern> pattern,
-- 
2.47.2