From 02601c74706bbe645ee31e2e1a2cef0f168a73e2 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Tue, 7 Jan 2025 18:43:32 +0000 Subject: [PATCH] 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 --- 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 112e129ea4a..b1ada75e3ff 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");