diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2025-01-07 12:32:43 +0000 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-21 12:56:55 +0100 |
| commit | a362f8a7d78da919d3e8ad5d924109a3c1521131 (patch) | |
| tree | 9f92330f8d5821ce515b806f8be093ffd192296e /gcc/testsuite/rust/compile | |
| parent | c35aa64fbf71c11d30c7a9f8c37a9fc07ada8a7b (diff) | |
| download | gcc-a362f8a7d78da919d3e8ad5d924109a3c1521131.zip gcc-a362f8a7d78da919d3e8ad5d924109a3c1521131.tar.gz gcc-a362f8a7d78da919d3e8ad5d924109a3c1521131.tar.bz2 | |
gccrs: fix ICE in borrows to invalid expressions
We need to check if the borrowed value is valid before creating the
reference type. Otherwise this will lead to an ICE.
Fixes Rust-GCC#3140
gcc/rust/ChangeLog:
* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit): check for error
* typecheck/rust-tyty-call.cc (TypeCheckCallExpr::visit): likewise and remove debug error
gcc/testsuite/ChangeLog:
* rust/compile/issue-3046.rs: remove old error message
* rust/compile/nr2/exclude: nr2 cant handle this
* rust/compile/issue-3140.rs: New test.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diffstat (limited to 'gcc/testsuite/rust/compile')
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-3046.rs | 4 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-3140.rs | 27 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nr2/exclude | 1 |
3 files changed, 29 insertions, 3 deletions
diff --git a/gcc/testsuite/rust/compile/issue-3046.rs b/gcc/testsuite/rust/compile/issue-3046.rs index c982cc9..f0c72a3 100644 --- a/gcc/testsuite/rust/compile/issue-3046.rs +++ b/gcc/testsuite/rust/compile/issue-3046.rs @@ -12,12 +12,10 @@ fn test(v: LOption) -> Res { return Res::BAD; } - fn main() { // Should be: // test(LOption::Some(2)); - // + // test(LOption(2)); // { dg-error "expected function, tuple struct or tuple variant, found enum" "" { target *-*-* } .-1 } - // { dg-error "failed to resolve type for argument expr in CallExpr" "" { target *-*-* } .-2 } } diff --git a/gcc/testsuite/rust/compile/issue-3140.rs b/gcc/testsuite/rust/compile/issue-3140.rs new file mode 100644 index 0000000..dcf86db --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-3140.rs @@ -0,0 +1,27 @@ +enum State { + Succeeded, + Failed, +} + +fn print_on_failure(state: &State) { + let mut num = 0; + match *state { + // error: expected unit struct, unit variant or constant, found tuple + // variant `State::Failed` + State::Failed => { + num = 1; + } + State::Succeeded => { + num = 2; + } + _ => (), + } +} + +fn main() { + let b = State::Failed(1); + // { dg-error "expected function, tuple struct or tuple variant, found struct .State." "" { target *-*-* } .-1 } + + print_on_failure(&b); + // { dg-error "cannot find value .b. in this scope" "" { target *-*-* } .-1 } +} diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude index 945a697..e7344ed 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -195,4 +195,5 @@ issue-266.rs additional-trait-bounds2.rs auto_traits2.rs auto_traits3.rs +issue-3140.rs # please don't delete the trailing newline |