public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-8853] gccrs: Fix ICE accessing empty vector without check
@ 2024-02-07 12:44 Arthur Cohen
0 siblings, 0 replies; only message in thread
From: Arthur Cohen @ 2024-02-07 12:44 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:1c649ac36f1eab8094fb0a697c001e064c031ac1
commit r14-8853-g1c649ac36f1eab8094fb0a697c001e064c031ac1
Author: Philip Herron <herron.philip@googlemail.com>
Date: Sat Feb 3 16:32:13 2024 +0000
gccrs: Fix ICE accessing empty vector without check
Fixes #2747
gcc/rust/ChangeLog:
* typecheck/rust-tyty-subst.cc (SubstitutionRef::get_mappings_from_generic_args): fix
gcc/testsuite/ChangeLog:
* rust/compile/issue-2747.rs: New test.
Diff:
---
gcc/rust/typecheck/rust-tyty-subst.cc | 3 ++-
gcc/testsuite/rust/compile/issue-2747.rs | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/gcc/rust/typecheck/rust-tyty-subst.cc b/gcc/rust/typecheck/rust-tyty-subst.cc
index 0a8340e317db..5a753566d48a 100644
--- a/gcc/rust/typecheck/rust-tyty-subst.cc
+++ b/gcc/rust/typecheck/rust-tyty-subst.cc
@@ -660,7 +660,8 @@ SubstitutionRef::get_mappings_from_generic_args (
if (args.get_type_args ().size () + offs > substitutions.size ())
{
rich_location r (line_table, args.get_locus ());
- r.add_range (substitutions.front ().get_param_locus ());
+ if (!substitutions.empty ())
+ r.add_range (substitutions.front ().get_param_locus ());
rust_error_at (
r,
diff --git a/gcc/testsuite/rust/compile/issue-2747.rs b/gcc/testsuite/rust/compile/issue-2747.rs
new file mode 100644
index 000000000000..a9c09e7372f4
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-2747.rs
@@ -0,0 +1,31 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+ #[lang = "fn_once_output"]
+ type Output;
+
+ extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+
+struct Foo<'a, 'b: 'a> {
+ x: &'a i32,
+ y: &'a i32,
+ a: &'b i32,
+ q: &'a [&'b i32],
+}
+
+pub fn test<'x, 'y>(f: Foo<'x, 'y, ()>) {
+ // { dg-error "generic item takes at most 0 type arguments but 1 were supplied" "" { target *-*-* } .-1 }
+ let x = 5;
+ let y = 6;
+ let z = 7;
+ type F<'a, 'b> = fn(&'a i32, &'b i32) -> i32;
+ let f = Foo {
+ x: &x,
+ y: &y,
+ a: &z,
+ q: &[&x, &y],
+ };
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-02-07 12:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-07 12:44 [gcc r14-8853] gccrs: Fix ICE accessing empty vector without check Arthur Cohen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).