public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] Statics are a coercion site
Date: Fri, 23 Sep 2022 06:51:45 +0000 (GMT)	[thread overview]
Message-ID: <20220923065145.0F3273857BBE@sourceware.org> (raw)

https://gcc.gnu.org/g:6b6a1c70f47237a5c2db76db62d7f8956244dee6

commit 6b6a1c70f47237a5c2db76db62d7f8956244dee6
Author: Philip Herron <philip.herron@embecosm.com>
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);
 }

                 reply	other threads:[~2022-09-23  6:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220923065145.0F3273857BBE@sourceware.org \
    --to=tschwinge@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).