diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2023-07-30 00:19:15 +0100 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:56:03 +0100 |
| commit | 0610584d0d03dc44ce7403dad7028bdc1acceb7e (patch) | |
| tree | 8feaf5c0418e35e0572a8f308839b9d1cf3f0d28 | |
| parent | 6164ec07c64f9ceb40fc5f4f6efb5c0f836fb04f (diff) | |
| download | gcc-0610584d0d03dc44ce7403dad7028bdc1acceb7e.zip gcc-0610584d0d03dc44ce7403dad7028bdc1acceb7e.tar.gz gcc-0610584d0d03dc44ce7403dad7028bdc1acceb7e.tar.bz2 | |
gccrs: fix ice when function is outside of context
Fixes #2477
gcc/rust/ChangeLog:
* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit):
We need to check if a function context exists
gcc/testsuite/ChangeLog:
* rust/compile/issue-2477.rs: New test.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-expr.cc | 8 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-2477.rs | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc index b7538ab..74c4217 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc @@ -150,6 +150,14 @@ TypeCheckExpr::visit (HIR::TupleExpr &expr) void TypeCheckExpr::visit (HIR::ReturnExpr &expr) { + if (!context->have_function_context ()) + { + rust_error_at (expr.get_locus (), + "return statement outside of function body"); + infered = new TyTy::ErrorType (expr.get_mappings ().get_hirid ()); + return; + } + auto fn_return_tyty = context->peek_return_type (); location_t expr_locus = expr.has_return_expr () ? expr.get_expr ()->get_locus () diff --git a/gcc/testsuite/rust/compile/issue-2477.rs b/gcc/testsuite/rust/compile/issue-2477.rs new file mode 100644 index 0000000..26831a6 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-2477.rs @@ -0,0 +1,3 @@ +const FOO: u32 = return 0; +// { dg-error "return statement outside of function body" "" { target *-*-* } .-1 } +// { dg-error "expected .u32. got" "" { target *-*-* } .-2 } |