From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 09D2E3858429; Tue, 16 Jan 2024 18:05:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09D2E3858429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705428321; bh=foYNmcAeKBGxdvcs5lbcacRfyoO+sbQAK0ToTwqaNpI=; h=From:To:Subject:Date:From; b=cCwnrzvhW1cAYKKRFdCm8+h5u9GPTPQVqHE2+f+Sy7c0mjKM5hKcTeCRbfDcebS2E VhPn4M/GkVh4P0vCec3ZREGIh+p+q8juiavuYdGZ3oRcBoafQBMIoX2yxTyIIuiUv/ jaNRvZRJhV6mXQVZVT/7RMFv4ecrs1sxyfqvXLoU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-7866] gccrs: fix ice when function is outside of context X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 6164ec07c64f9ceb40fc5f4f6efb5c0f836fb04f X-Git-Newrev: 0610584d0d03dc44ce7403dad7028bdc1acceb7e Message-Id: <20240116180521.09D2E3858429@sourceware.org> Date: Tue, 16 Jan 2024 18:05:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0610584d0d03dc44ce7403dad7028bdc1acceb7e commit r14-7866-g0610584d0d03dc44ce7403dad7028bdc1acceb7e Author: Philip Herron Date: Sun Jul 30 00:19:15 2023 +0100 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 Diff: --- gcc/rust/typecheck/rust-hir-type-check-expr.cc | 8 ++++++++ gcc/testsuite/rust/compile/issue-2477.rs | 3 +++ 2 files changed, 11 insertions(+) diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc index b7538abe5db..74c4217e578 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 00000000000..26831a6625d --- /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 }