From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 0F3273857BBE; Fri, 23 Sep 2022 06:51:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F3273857BBE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663915905; bh=pDyusRSib2k/4EUKAxuMvKPcQhn8dLmtkOumkx9uN/E=; h=From:To:Subject:Date:From; b=R/nzlaiubVluYAplB2FUX71CzNRLIkWCLkF4tzKvqYagQhZsZ2Z3Ih7XAbyM/JEOI DkBCCbEoHLu3afHfsxLL7V7Sff7NwyJL3A3M1+rmuuVJMpEw2W0ntsG8BvE/29E4zN 1WO8lnbVTOcYm9yP4+9Vjbyxb/w1dPu26XSxwYFQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Statics are a coercion site X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 53f4a8601c1db2068390dce7012c16b383864740 X-Git-Newrev: 6b6a1c70f47237a5c2db76db62d7f8956244dee6 Message-Id: <20220923065145.0F3273857BBE@sourceware.org> Date: Fri, 23 Sep 2022 06:51:45 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6b6a1c70f47237a5c2db76db62d7f8956244dee6 commit 6b6a1c70f47237a5c2db76db62d7f8956244dee6 Author: Philip Herron Date: Sat Sep 17 10:05:59 2022 +0100 Statics are a coercion site Statics can be assigned to a block expression meaning they need to behave similarly to constant items. Diff: --- gcc/rust/typecheck/rust-hir-type-check-toplevel.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc b/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc index c4688dbdf7f..a2113d00a97 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-toplevel.cc @@ -261,11 +261,11 @@ TypeCheckTopLevel::visit (HIR::StaticItem &var) TyTy::BaseType *expr_type = TypeCheckExpr::Resolve (var.get_expr ()); TyTy::BaseType *unified - = unify_site (var.get_mappings ().get_hirid (), - TyTy::TyWithLocation (type, var.get_type ()->get_locus ()), - TyTy::TyWithLocation (expr_type, - var.get_expr ()->get_locus ()), - var.get_locus ()); + = coercion_site (var.get_mappings ().get_hirid (), + TyTy::TyWithLocation (type, var.get_type ()->get_locus ()), + TyTy::TyWithLocation (expr_type, + var.get_expr ()->get_locus ()), + var.get_locus ()); context->insert_type (var.get_mappings (), unified); }