From 4242d45d3d6590630ea88909ed996b8cf2640d35 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Fri, 11 Feb 2022 10:27:55 +0000 Subject: refactor named_constant_expression out of the backend class --- gcc/rust/backend/rust-compile-base.cc | 22 ++++++++++++++++++++-- gcc/rust/backend/rust-compile-base.h | 4 ++++ 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'gcc/rust/backend') diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc index 85d85b9..9f936d2 100644 --- a/gcc/rust/backend/rust-compile-base.cc +++ b/gcc/rust/backend/rust-compile-base.cc @@ -445,8 +445,26 @@ HIRCompileBase::compile_constant_item ( folded_expr = ConstCtx::fold (call); } - return ctx->get_backend ()->named_constant_expression (const_type, ident, - folded_expr, locus); + return named_constant_expression (const_type, ident, folded_expr, locus); +} + +tree +HIRCompileBase::named_constant_expression (tree type_tree, + const std::string &name, + tree const_val, Location location) +{ + if (type_tree == error_mark_node || const_val == error_mark_node) + return error_mark_node; + + tree name_tree = get_identifier_with_length (name.data (), name.length ()); + tree decl + = build_decl (location.gcc_location (), CONST_DECL, name_tree, type_tree); + DECL_INITIAL (decl) = const_val; + TREE_CONSTANT (decl) = 1; + TREE_READONLY (decl) = 1; + + rust_preserve_from_gc (decl); + return decl; } } // namespace Compile diff --git a/gcc/rust/backend/rust-compile-base.h b/gcc/rust/backend/rust-compile-base.h index 17e889c..a52886c 100644 --- a/gcc/rust/backend/rust-compile-base.h +++ b/gcc/rust/backend/rust-compile-base.h @@ -96,6 +96,10 @@ protected: compile_constant_item (Context *ctx, TyTy::BaseType *resolved_type, const Resolver::CanonicalPath *canonical_path, HIR::Expr *const_value_expr, Location locus); + + static tree named_constant_expression (tree type_tree, + const std::string &name, + tree const_val, Location location); }; } // namespace Compile -- cgit v1.1