From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id EC73B38582B2; Fri, 23 Sep 2022 06:51:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC73B38582B2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663915899; bh=hUG9ftv3/LRdkA0HXIbu/WZay/NVp343gxBezwrOvEo=; h=From:To:Subject:Date:From; b=mv4Ko6wHMIwKXxgi7dU6FVEHIFStJGZ7dE+VSieK4M7zKFdJGiQhN61vZxrw/wUNe t5juYPGS2XRq6FhvJOzEsYUAkFdnoIY6kWsCCB7TwbW1tjqAPacmYcArmvD/L42xDu +Loewm/QqQY/wkr2kdW7ReFXQUt2vKryss+RPn1o= 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] Static Items must be const evaluated X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: f252b4093666cf1e3d948b22f00fc12bf283a83f X-Git-Newrev: 53f4a8601c1db2068390dce7012c16b383864740 Message-Id: <20220923065139.EC73B38582B2@sourceware.org> Date: Fri, 23 Sep 2022 06:51:39 +0000 (GMT) List-Id: https://gcc.gnu.org/g:53f4a8601c1db2068390dce7012c16b383864740 commit 53f4a8601c1db2068390dce7012c16b383864740 Author: Philip Herron Date: Sat Sep 17 10:04:49 2022 +0100 Static Items must be const evaluated 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. Diff: --- 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 96c4e7fcf61..8ba17c9ff0d 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);