diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2025-03-28 17:42:07 +0000 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-31 21:07:24 +0200 |
| commit | 3729b279fbef2404d91f08009102e5dd497f5cb6 (patch) | |
| tree | c0f77250a0d38c0151e6b43dc9d91cc92509a72c /gcc | |
| parent | a0b0d2a58ec8b830d0a88039709e2002b32dc2a8 (diff) | |
| download | gcc-3729b279fbef2404d91f08009102e5dd497f5cb6.zip gcc-3729b279fbef2404d91f08009102e5dd497f5cb6.tar.gz gcc-3729b279fbef2404d91f08009102e5dd497f5cb6.tar.bz2 | |
gccrs: FIX ICE when working with HIR::BareFunctionType
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.philip@googlemail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/hir/rust-hir-dump.cc | 4 | ||||
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-type.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-3615.rs | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc index 0a9d617..89fcc3d 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 689d86b..6a6c319 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 0000000..e5c5072 --- /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 + } +} |