aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPhilip Herron <herron.philip@googlemail.com>2024-02-03 16:32:13 +0000
committerArthur Cohen <arthur.cohen@embecosm.com>2024-02-07 12:40:22 +0100
commit1c649ac36f1eab8094fb0a697c001e064c031ac1 (patch)
tree19b0261d51cd86b1a0fb5b24d4351efb563d16a0 /gcc
parent9fecac88d3ce37d3c2c483ea712e48baf904f27b (diff)
downloadgcc-1c649ac36f1eab8094fb0a697c001e064c031ac1.zip
gcc-1c649ac36f1eab8094fb0a697c001e064c031ac1.tar.gz
gcc-1c649ac36f1eab8094fb0a697c001e064c031ac1.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/rust/typecheck/rust-tyty-subst.cc3
-rw-r--r--gcc/testsuite/rust/compile/issue-2747.rs31
2 files changed, 33 insertions, 1 deletions
diff --git a/gcc/rust/typecheck/rust-tyty-subst.cc b/gcc/rust/typecheck/rust-tyty-subst.cc
index 0a8340e..5a75356 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 0000000..a9c09e7
--- /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],
+ };
+}