[gcc r15-8598] gccrs: fix ICE with hir dump on closure

[Arthur Cohen via Gcc-cvs]

https://gcc.gnu.org/g:d3efd2a91f54a19c3c2d59d690c447c0def26367

commit r15-8598-gd3efd2a91f54a19c3c2d59d690c447c0def26367
Author: Philip Herron <herron.phi...@googlemail.com>
Date:   Tue Jan 7 18:43:32 2025 +0000

    gccrs: fix ICE with hir dump on closure
    
    Return type and parameter types are optional on closures.
    
    gcc/rust/ChangeLog:
    
            * hir/rust-hir-dump.cc (Dump::visit): add null guard
    
    Signed-off-by: Philip Herron <herron.phi...@googlemail.com>

Diff:
---
 gcc/rust/hir/rust-hir-dump.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
index 5acf53e9296f..798179d172ee 100644
--- a/gcc/rust/hir/rust-hir-dump.cc
+++ b/gcc/rust/hir/rust-hir-dump.cc
@@ -1244,13 +1244,17 @@ Dump::visit (ClosureExpr &e)
          auto oa = param.get_outer_attrs ();
          do_outer_attrs (oa);
          visit_field ("pattern", param.get_pattern ());
-         visit_field ("type", param.get_type ());
+
+         if (param.has_type_given ())
+           visit_field ("type", param.get_type ());
+
          end ("ClosureParam");
        }
       end_field ("params");
     }
 
-  visit_field ("return_type", e.get_return_type ());
+  if (e.has_return_type ())
+    visit_field ("return_type", e.get_return_type ());
 
   visit_field ("expr", e.get_expr ());
   end ("ClosureExpr");