From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 9573E384F031; Tue, 31 Jan 2023 13:15:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9573E384F031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675170958; bh=/ayTom9ZDACjRJ8nmBkUK/oo9BU+V0GmnVVd/bo+50c=; h=From:To:Subject:Date:From; b=tEMpFymr7wNvlTKFtA7AkBRV9BFOFhxzxEv/3Aj17OPvv+aRy3zl7dm1vzNBD6zKV tVl4TY50ZbDFIVYLEL3ztR94n/CbbdVq8/HbUsHxZJ5zFClpH87s/lrTLbiLBfOy5s 354mNU3Y9c3kEirBRhdnsqBB6lw+75OErTkWnrj4= 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 r13-5554] gccrs: bugfix: initialize slice from array in const context X-Act-Checkin: gcc X-Git-Author: Faisal Abbas <90.abbasfaisal@gmail.com> X-Git-Refname: refs/heads/master X-Git-Oldrev: 0fffc0e772d612d5c6ad72a632ac80b43eca1950 X-Git-Newrev: 689a5c6711b8217158988763ba25959f8112dcfc Message-Id: <20230131131558.9573E384F031@sourceware.org> Date: Tue, 31 Jan 2023 13:15:58 +0000 (GMT) List-Id: https://gcc.gnu.org/g:689a5c6711b8217158988763ba25959f8112dcfc commit r13-5554-g689a5c6711b8217158988763ba25959f8112dcfc Author: Faisal Abbas <90.abbasfaisal@gmail.com> Date: Sun Sep 4 16:07:43 2022 +0100 gccrs: bugfix: initialize slice from array in const context gcc/rust/ChangeLog: * typecheck/rust-hir-type-check-stmt.cc (TypeCheckStmt::visit): Turn constant item typechecking into a coercion site instead of a unify site. gcc/testsuite/ChangeLog: * rust/compile/const6.rs: New test. Signed-off-by: Faisal Abbas <90.abbasfaisal@gmail.com> Diff: --- gcc/rust/typecheck/rust-hir-type-check-stmt.cc | 2 +- gcc/testsuite/rust/compile/const6.rs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc index e82dd8e5300..a55cf22ba23 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc @@ -68,7 +68,7 @@ TypeCheckStmt::visit (HIR::ConstantItem &constant) TyTy::BaseType *type = TypeCheckType::Resolve (constant.get_type ()); TyTy::BaseType *expr_type = TypeCheckExpr::Resolve (constant.get_expr ()); - infered = unify_site ( + infered = coercion_site ( constant.get_mappings ().get_hirid (), TyTy::TyWithLocation (type, constant.get_type ()->get_locus ()), TyTy::TyWithLocation (expr_type, constant.get_expr ()->get_locus ()), diff --git a/gcc/testsuite/rust/compile/const6.rs b/gcc/testsuite/rust/compile/const6.rs new file mode 100644 index 00000000000..8f0dc320129 --- /dev/null +++ b/gcc/testsuite/rust/compile/const6.rs @@ -0,0 +1,4 @@ +fn main() { + const array:[i32; 1] = [1]; + const slice:&[i32] = &array; +}