Fix fnptr not auto implement fn once

gcc/rust/ChangeLog:

	* typecheck/rust-tyty.cc (VariantDef::clone):
	reformat
	(VariantDef::monomorphized_clone):
	reformat
	(FnPtr::setup_fn_once_output):
	Fix fnptr not auto implement fn once
	* typecheck/rust-tyty.h: Likewise.

gcc/testsuite/ChangeLog:

	* rust/compile/format_args_basic_expansion.rs: add sized and fn_once
	* rust/compile/issue-2042.rs: add sized and fn_once
	* rust/compile/privacy6.rs: add sized and fn_once
	* rust/compile/rust_abi.rs: add sized and fn_once
	* rust/compile/torture/function_reference2.rs: add sized and fn_once
	* rust/compile/torture/function_reference3.rs: add sized and fn_once
	* rust/compile/torture/function_reference4.rs: add sized and fn_once
	* rust/compile/try-catch-unwind-new.rs: add sized and fn_once
	* rust/compile/try-catch-unwind-old.rs: add sized and fn_once

Author: badumbatish

gcc/rust/typecheck/rust-tyty.cc

@@ -1590,7 +1590,7 @@ VariantDef::clone () const
 
   auto &&discriminant_opt = has_discriminant ()
 			      ? tl::optional<std::unique_ptr<HIR::Expr>> (
-				get_discriminant ().clone_expr ())
+				  get_discriminant ().clone_expr ())
 			      : tl::nullopt;
 
   return new VariantDef (id, defid, identifier, ident, type,
@@ -1606,7 +1606,7 @@ VariantDef::monomorphized_clone () const
 
   auto discriminant_opt = has_discriminant ()
 			    ? tl::optional<std::unique_ptr<HIR::Expr>> (
-			      get_discriminant ().clone_expr ())
+				get_discriminant ().clone_expr ())
 			    : tl::nullopt;
 
   return new VariantDef (id, defid, identifier, ident, type,
@@ -2222,6 +2222,56 @@ FnPtr::clone () const
 		    get_combined_refs ());
 }
 
+void
+FnPtr::setup_fn_once_output () const
+{
+  // lookup the lang items
+  auto fn_once_lookup = mappings.lookup_lang_item (LangItem::Kind::FN_ONCE);
+  auto fn_once_output_lookup
+    = mappings.lookup_lang_item (LangItem::Kind::FN_ONCE_OUTPUT);
+  if (!fn_once_lookup)
+    {
+      rust_fatal_error (UNKNOWN_LOCATION,
+			"Missing required %<fn_once%> lang item");
+      return;
+    }
+  if (!fn_once_output_lookup)
+    {
+      rust_fatal_error (UNKNOWN_LOCATION,
+			"Missing required %<fn_once_ouput%> lang item");
+      return;
+    }
+
+  DefId &trait_id = fn_once_lookup.value ();
+  DefId &trait_item_id = fn_once_output_lookup.value ();
+
+  // resolve to the trait
+  HIR::Item *item = mappings.lookup_defid (trait_id).value ();
+  rust_assert (item->get_item_kind () == HIR::Item::ItemKind::Trait);
+  HIR::Trait *trait = static_cast<HIR::Trait *> (item);
+
+  Resolver::TraitReference *trait_ref
+    = Resolver::TraitResolver::Resolve (*trait);
+  rust_assert (!trait_ref->is_error ());
+
+  // resolve to trait item
+  HIR::TraitItem *trait_item
+    = mappings.lookup_trait_item_defid (trait_item_id).value ();
+  rust_assert (trait_item->get_item_kind ()
+	       == HIR::TraitItem::TraitItemKind::TYPE);
+  std::string item_identifier = trait_item->trait_identifier ();
+
+  // setup associated types  #[lang = "fn_once_output"]
+  Resolver::TraitItemReference *item_reference = nullptr;
+  bool found = trait_ref->lookup_trait_item_by_type (
+    item_identifier, Resolver::TraitItemReference::TraitItemType::TYPE,
+    &item_reference);
+  rust_assert (found);
+
+  // setup
+  item_reference->associated_type_set (&get_result_type ());
+}
+
 void
 ClosureType::accept_vis (TyVisitor &vis)
 {

gcc/rust/typecheck/rust-tyty.h

@@ -265,8 +265,8 @@ class CallableTypeInterface : public BaseType
   {}
 
   WARN_UNUSED_RESULT virtual size_t get_num_params () const = 0;
-  WARN_UNUSED_RESULT virtual BaseType *
-  get_param_type_at (size_t index) const = 0;
+  WARN_UNUSED_RESULT virtual BaseType *get_param_type_at (size_t index) const
+    = 0;
   WARN_UNUSED_RESULT virtual BaseType *get_return_type () const = 0;
 };
 
@@ -971,15 +971,19 @@ class FnPtr : public CallableTypeInterface
 			     {Resolver::CanonicalPath::create_empty (), locus},
 			     refs),
       params (std::move (params)), result_type (result_type)
-  {}
+  {
+    setup_fn_once_output ();
+  }
 
   FnPtr (HirId ref, HirId ty_ref, location_t locus, std::vector<TyVar> params,
 	 TyVar result_type, std::set<HirId> refs = std::set<HirId> ())
     : CallableTypeInterface (ref, ty_ref, TypeKind::FNPTR,
 			     {Resolver::CanonicalPath::create_empty (), locus},
 			     refs),
       params (params), result_type (result_type)
-  {}
+  {
+    setup_fn_once_output ();
+  }
 
   std::string get_name () const override final { return as_string (); }
 
@@ -1000,6 +1004,7 @@ class FnPtr : public CallableTypeInterface
 
   const TyVar &get_var_return_type () const { return result_type; }
 
+  TyTy::BaseType &get_result_type () const { return *result_type.get_tyty (); }
   size_t num_params () const { return params.size (); }
 
   void accept_vis (TyVisitor &vis) override;
@@ -1016,6 +1021,8 @@ class FnPtr : public CallableTypeInterface
   std::vector<TyVar> &get_params () { return params; }
   const std::vector<TyVar> &get_params () const { return params; }
 
+  void setup_fn_once_output () const;
+
 private:
   std::vector<TyVar> params;
   TyVar result_type;

gcc/testsuite/rust/compile/format_args_basic_expansion.rs

@@ -1,3 +1,6 @@
+
+
+
 #![feature(rustc_attrs)]
 
 #[rustc_builtin_macro]
@@ -8,6 +11,14 @@ macro_rules! format_args {
 #[lang = "sized"]
 trait Sized {}
 
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
 pub mod core {
     pub mod fmt {
         pub struct Formatter;

gcc/testsuite/rust/compile/issue-2042.rs

@@ -1,3 +1,15 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+
 fn f<'r>(p: &'r mut fn(p: &mut ())) {
     (*p)(())
     // { dg-error "expected .&mut ()." "" { target *-*-* } .-1 }

gcc/testsuite/rust/compile/privacy6.rs

@@ -1,3 +1,13 @@
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+
 // { dg-additional-options "-w" }
 
 #[lang = "sized"]

gcc/testsuite/rust/compile/rust_abi.rs

@@ -1 +1,13 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+
 pub fn f(_: extern "Rust" fn()) {}

gcc/testsuite/rust/compile/torture/function_reference2.rs

@@ -1,3 +1,15 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+
 fn test(a: i32) -> i32 {
     a + 1
 }

gcc/testsuite/rust/compile/torture/function_reference3.rs

@@ -1,3 +1,15 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+
 struct Foo {
     a: fn(i32) -> i32,
     b: i32,

gcc/testsuite/rust/compile/torture/function_reference4.rs

@@ -1,3 +1,15 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+
 fn test(a: i32) -> i32 {
     a + 1
 }

gcc/testsuite/rust/compile/try-catch-unwind-new.rs

@@ -1,6 +1,19 @@
+
+
 // { dg-options "-O2 -w -fdump-tree-optimized" }
 #![feature(intrinsics)]
 
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
 extern "rust-intrinsic" {
     // { dg-final { scan-tree-dump-times "__builtin_eh_pointer" 1 "optimized" } }
     fn catch_unwind(try_fn: fn(_: *mut u8), data: *mut u8, catch_fn: fn(_: *mut u8, _: *mut u8));

gcc/testsuite/rust/compile/try-catch-unwind-old.rs

@@ -1,6 +1,18 @@
+
 // { dg-options "-O2 -w -fdump-tree-optimized" }
 #![feature(intrinsics)]
 
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
 extern "rust-intrinsic" {
     // { dg-final { scan-tree-dump-times "__builtin_eh_pointer" 1 "optimized" } }
     fn r#try(try_fn: fn(_: *mut u8), data: *mut u8, catch_fn: fn(_: *mut u8, _: *mut u8)) -> i32;