procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gccrs: FIX ICE when working with HIR::BareFunctionType

Browse source 
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>
This commit is contained in:
Philip Herron 2025-03-28 17:42:07 +00:00 • committed by Arthur Cohen
parent a0b0d2a58e
commit 3729b279fb
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/rust/hir/rust-hir-dump.cc
View file

@ -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");
}

3
gcc/rust/hir/tree/rust-hir-type.cc
View file

@ -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 &

7
gcc/testsuite/rust/compile/issue-3615.rs Normal file
View file

@ -0,0 +1,7 @@
pub trait Trait {
pub fn nrvo(init: fn()) -> [u8; 4096] {
let mut buf = [0; 4096];
buf
}
}