From patchwork Tue Jan 31 13:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 50930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2814009wrn; Tue, 31 Jan 2023 07:27:17 -0800 (PST) X-Google-Smtp-Source: AK7set+Njyu20gfELWmYxm+cfnY2jtzxxsE9s2xP9Xvb5nzNG7NBQ0HOfMmz5E+zh3wjUSOzUwhV X-Received: by 2002:a17:907:7f28:b0:886:9b85:ac5d with SMTP id qf40-20020a1709077f2800b008869b85ac5dmr13208473ejc.44.1675178837311; Tue, 31 Jan 2023 07:27:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675178837; cv=none; d=google.com; s=arc-20160816; b=Sfxew6QS6ekYoeSsUyf+DJ+7LVQ6+5ID/ZSGWP+xJtclB/XZTzxnFP2laov4HiJf28 HTXOmUBpdaVga1Z70yzK0PbJn/kX7ywTqZViBpMGFDqxZM4Y+7ziYJBkrjFHJTvS9CjN l03ogUFH0aHFWaNUXNoLkh7ZZcr1ohcN7vBq2R0BFWJtYgQHZlo4dOwEa/cfwN0wCL4I cUNuIFszf9NtcCy/ldD8Qo2BBTr5EOyy3+fmF5MbnsRaN7pnJpvh96dkQTg3S/BWLR2J BEM2M42F7Y1X13ec8bCn2lELuVmTETL+s76gV+Fbo1+ccMdHDWeR0YO3koCNeKKd5vWe Kv6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :dmarc-filter:delivered-to; bh=AFvZFbUs5U//ovzAzjQFRpHxvIm/fi10sOUbRQhwOFg=; b=hzvW7bQS4s3+9DU0+df/0fPboqZNPVa8hl4VJKfM5b7lO+5IwWnPxJ7gRH9siatGqN KR+06POwgpELcpc9qB8vi6WRLiS7TXnRvE1tdIXFYO/F+dpQ8MglDV2jm4/DNPM/YHJr f22cjjzYkxYfKZ9vrxpJt4XQfYqMrTqE9DMxmDzCqyO/rSlr/Qb+OOJpefBZFF3r06YL cgllZvW7TF3/yAURx/L4Afp2AaVgh4ITlF49BEObtrJKX7ZJmyLSuSfFOSTahMaVVnXX V4t3pbkToK8VRjHr+uP8AL9hvAKJ/MSNCTiFax8Tx8zWYAwOIqK7k9MdmdfUa3sUul9Z twyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=gqIu8iS7; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id fu31-20020a170907b01f00b0088aba792fe8si5038745ejc.935.2023.01.31.07.27.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 07:27:17 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=gqIu8iS7; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A0A05388F96A for ; Tue, 31 Jan 2023 13:26:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 A7B2A396DC36 for ; Tue, 31 Jan 2023 13:22:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A7B2A396DC36 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-20020a05600c1c2000b003dc4fd6e61dso5588773wms.5 for ; Tue, 31 Jan 2023 05:22:40 -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=AFvZFbUs5U//ovzAzjQFRpHxvIm/fi10sOUbRQhwOFg=; b=gqIu8iS7pUmYJ6SPAC6GJZmY7HOusN81GHhv1IUnsjp1U1tDxqn/SEWOpa2J7waMBT blieKylqmhnAU3nAkz5olqtzmSPRMtux2zxDhObmYIsuMsMadZPX9lLpKFsPYjqNDjmb oI3tggfMdvmJTyZZ8e/3OWlRV7oWJB+ncKj5P3FJGDMxHQNQkKGslScmQS9pv2poWO1P TYj8utgauS0wyEP1N3mc1diXI2ckelsEIG4TS7XT6VYkitKqDtNbmQ6LpBd7RJ2av4HJ PiBmO8DtLNQQQIZmhckHfYKOksh0yhUofzNV+D+gubN6ajqVslIOMCz39vVmOdrcV2tA fNXA== 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=AFvZFbUs5U//ovzAzjQFRpHxvIm/fi10sOUbRQhwOFg=; b=yIQdQttEL9NbstXjwO98GTxsaNwJkWs4LgzCoJ63BqM7CbGIhDeZpEyYHFXBMkg/m+ fWPX4b9tCQIBcxkR1JB9Buqoz3YCFQH2dHDQwVvDLHzvFaaP7CKNZC1qiAK+zdyOt/0j /peqpMyk2awklAVquqCXJ1LYsf19pK0rPaQ1bu/uZEvOFcYG7S+h6mOWuG7YEqYJS+m5 ufJFbCno3SU0Gbh9NghFjKG8siV/NL1vWxikwprqobUAAKh5zckw82oKiUOpnZFVa/fI wrA/BbUbJAxrTG6gbaYHZdhmrgz26AB624mk9wrgXMkUI0ztYJyDY35vkWq33/GnS+C+ HF2A== X-Gm-Message-State: AO0yUKVptNqvOet9YvWRoCo00RZWhP7gSUY0Rg2zVkfajhmGMfmK2Qwt jtrRhVN2xLY+ytyqzTXpwhW3aoihLGa7CJ96aw== X-Received: by 2002:a05:600c:1c97:b0:3dd:1c45:d592 with SMTP id k23-20020a05600c1c9700b003dd1c45d592mr3055446wms.19.1675171359235; Tue, 31 Jan 2023 05:22:39 -0800 (PST) Received: from platypus.lan ([2001:861:5e4c:3bb0:6424:328a:1734:3249]) by smtp.gmail.com with ESMTPSA id l16-20020a7bc350000000b003d9aa76dc6asm22404787wmj.0.2023.01.31.05.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 05:22:38 -0800 (PST) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [COMMITTED] gccrs: Static Items must be const evaluated Date: Tue, 31 Jan 2023 14:26:24 +0100 Message-Id: <20230131132624.663288-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-14.5 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=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756552324291547642?= X-GMAIL-MSGID: =?utf-8?q?1756552324291547642?= From: Philip Herron Statics like constants need to have a singular value they are not functions to be lazy evaluated. So to evaluate a block expr we can just reuse our const code to resolve this to a singular value. gcc/rust/ChangeLog: * backend/rust-compile-item.cc (CompileItem::visit): Const evaluate static item expressions. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/rust/backend/rust-compile-item.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/rust/backend/rust-compile-item.cc b/gcc/rust/backend/rust-compile-item.cc index 634b983a771..d1cdc3b6698 100644 --- a/gcc/rust/backend/rust-compile-item.cc +++ b/gcc/rust/backend/rust-compile-item.cc @@ -43,13 +43,18 @@ CompileItem::visit (HIR::StaticItem &var) rust_assert (ok); tree type = TyTyResolveCompile::compile (ctx, resolved_type); - tree value = CompileExpr::Compile (var.get_expr (), ctx); const Resolver::CanonicalPath *canonical_path = nullptr; ok = ctx->get_mappings ()->lookup_canonical_path ( var.get_mappings ().get_nodeid (), &canonical_path); rust_assert (ok); + HIR::Expr *const_value_expr = var.get_expr (); + ctx->push_const_context (); + tree value = compile_constant_item (ctx, resolved_type, canonical_path, + const_value_expr, var.get_locus ()); + ctx->pop_const_context (); + std::string name = canonical_path->get (); std::string asm_name = ctx->mangle_item (resolved_type, *canonical_path);