[COMMITTED 31/35] gccrs: FIX ICE when working with HIR::BareFunctionType

[arthur . cohen]

From: Philip Herron <herron.phi...@googlemail.com>

Fixes Rust-GCC#3615

gcc/rust/ChangeLog:

        * hir/rust-hir-dump.cc (Dump::visit): check has type
        * hir/tree/rust-hir-type.cc (BareFunctionType::BareFunctionType): 
likewise

gcc/testsuite/ChangeLog:

        * rust/compile/issue-3615.rs: New test.

Signed-off-by: Philip Herron <herron.phi...@googlemail.com>
---
 gcc/rust/hir/rust-hir-dump.cc            | 4 +++-
 gcc/rust/hir/tree/rust-hir-type.cc       | 3 ++-
 gcc/testsuite/rust/compile/issue-3615.rs | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/rust/compile/issue-3615.rs

diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
index 0a9d617a919..89fcc3dd1f9 100644
--- a/gcc/rust/hir/rust-hir-dump.cc
+++ b/gcc/rust/hir/rust-hir-dump.cc
@@ -2440,7 +2440,9 @@ Dump::visit (BareFunctionType &e)
       end_field ("params");
     }
 
-  visit_field ("return_type", e.get_return_type ());
+  if (e.has_return_type ())
+    visit_field ("return_type", e.get_return_type ());
+
   put_field ("is_variadic", std::to_string (e.get_is_variadic ()));
   end ("BareFunctionType");
 }
diff --git a/gcc/rust/hir/tree/rust-hir-type.cc 
b/gcc/rust/hir/tree/rust-hir-type.cc
index 689d86b7372..6a6c319fc98 100644
--- a/gcc/rust/hir/tree/rust-hir-type.cc
+++ b/gcc/rust/hir/tree/rust-hir-type.cc
@@ -268,7 +268,8 @@ BareFunctionType::BareFunctionType (BareFunctionType const 
&other)
     for_lifetimes (other.for_lifetimes),
     function_qualifiers (other.function_qualifiers), params (other.params),
     is_variadic (other.is_variadic),
-    return_type (other.return_type->clone_type ())
+    return_type (other.has_return_type () ? other.return_type->clone_type ()
+                                         : nullptr)
 {}
 
 BareFunctionType &
diff --git a/gcc/testsuite/rust/compile/issue-3615.rs 
b/gcc/testsuite/rust/compile/issue-3615.rs
new file mode 100644
index 00000000000..e5c50725ea2
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-3615.rs
@@ -0,0 +1,7 @@
+pub trait Trait {
+    pub fn nrvo(init: fn()) -> [u8; 4096] {
+        let mut buf = [0; 4096];
+
+        buf
+    }
+}
-- 
2.49.0