From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 132243952518 for ; Tue, 31 Jan 2023 13:22:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 132243952518 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x32c.google.com with SMTP id j32-20020a05600c1c2000b003dc4fd6e61dso5589243wms.5 for ; Tue, 31 Jan 2023 05:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HpW4NwAcCbOVh6lyC7GPbvJa27IQ4H3lps395+OQNcM=; b=Ua3t9j7o0cjMoy4+bVAlOUfGh+tIbAkgpnElt3oog6lpX03Zes0uThC99fxOdcrMVh GuPtsZ+yotsXMLS8DCMtCI2rbD8uhXMB1nu76HMNdtJAltXOvT6CK5RGl/tFWnNWWwdI MUkRZa1B0ks9xVuqVsypwlNzSh6GsrMYCZX8UjRBGuqceynyDx0esmIGvHvfo7sLFv+d WJjIF4GkOIxCWifThD94VWPhVO/+mHW2iVDFYHGq73WkoLpKptwB0rKWJ3mPFPCw8Czv tzxScTyvZehfeeKiF2he59PvqnEiEYu+ZKGm7220OC2lxpaRmAnZE4+dKAfTfohzL+WN otaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HpW4NwAcCbOVh6lyC7GPbvJa27IQ4H3lps395+OQNcM=; b=EjeAG76g9+LLG1OYwWv+VP7r4Z4UVzyvSvo/BBioiJZw1LFj9gXuF3PyHYvHkvm+3D o6n97FqEZTQAZOraMf4EEBVUDdzHRKIRhT8mpzbKNbLCz5BfQDZxbVtgbJ9veW6sCZYt CvQ1qSmbkdFYpK24su40S6MWXbVI8xjiF1hG8yjZgK3txIr72OCiBNKhjRlM9kbWd/eF QBNH+6Rs4AafolHcWK5qyDFQOjiqM7ULKVdNZ9Av7dNBOEpKFN9dRe6MOsJsZtKUb62X m1fQCYE70zrAFLAHmx+6/Xqdj/rRqgGACdd8JR8bqprBnc6j2fLadY2dmA7Gp0NGXoFY uP+g== X-Gm-Message-State: AO0yUKVeumrp82SPiMMSLLNbnevFpVj7AuKyOvDSvIuO8B9Egpw2pWji 6NdeCIcO56lG/UNmiIpHv9fFZGRPAGX4G75a1Q== X-Google-Smtp-Source: AK7set/qEjT33Q/u/OxMcs1oe2rzeItddrN37J8oJq1H1DT/MGP01eUCI8qcxsiYBUjwIHxiFRORKg== X-Received: by 2002:a05:600c:3c86:b0:3dd:1b76:347f with SMTP id bg6-20020a05600c3c8600b003dd1b76347fmr3615837wmb.18.1675171372529; Tue, 31 Jan 2023 05:22:52 -0800 (PST) Received: from platypus.lan ([2001:861:5e4c:3bb0:6424:328a:1734:3249]) by smtp.gmail.com with ESMTPSA id i19-20020a05600c2d9300b003dc4fd6e624sm9075222wmg.19.2023.01.31.05.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 05:22:52 -0800 (PST) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [COMMITTED] gccrs: Statics are a coercion site Date: Tue, 31 Jan 2023 14:26:33 +0100 Message-Id: <20230131132633.663363-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-15.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Philip Herron Statics can be assigned to a block expression meaning they need to behave similarly to constant items. gcc/rust/ChangeLog: * typecheck/rust-hir-type-check-toplevel.cc (TypeCheckTopLevel::visit): Make static items behave more similarly to const items. Tested on x86_64-pc-linux-gnu, committed on master. --- 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 b0ee292df10..594e527fdcf 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); } -- 2.39.1