From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 116C73858011; Tue, 30 Jan 2024 12:00:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 116C73858011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1706616026; bh=XUUzFtAe0SPVihyz/bu7MUFsgyUMbgrRAfpzD8N4iIg=; h=From:To:Subject:Date:From; b=F7+TyMrBpHZIGYiD3v2marZQS+rGptFEf3ormEHGsRn9DiL0zH74lmuVOj//FVpM2 Kw+u3S1Gnn6pGkjXrrXmA05SuALoG+mQTPi5euWQsSkOEC39kMwXaky0ONhHRWIGcK 6WFiv5yaap4H89mBEW7wcKAS59E6uv3yLG66URes= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-8596] gccrs: HIR: add missing getters X-Act-Checkin: gcc X-Git-Author: Jakub Dupak X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 5bcfcfe98550cdc72ba76bf0872b2b4e5129caa5 X-Git-Newrev: cc9465332ebcabebb04b95549989d74a8f1c0ce6 Message-Id: <20240130120026.116C73858011@sourceware.org> Date: Tue, 30 Jan 2024 12:00:24 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cc9465332ebcabebb04b95549989d74a8f1c0ce6 commit r14-8596-gcc9465332ebcabebb04b95549989d74a8f1c0ce6 Author: Jakub Dupak Date: Sun Dec 3 11:07:04 2023 +0100 gccrs: HIR: add missing getters gcc/rust/ChangeLog: * hir/tree/rust-hir-item.h: Ad lifetime getter. * hir/tree/rust-hir-path.h: Make getter const ref. * hir/tree/rust-hir.h: Const ref and new getter. Signed-off-by: Jakub Dupak Diff: --- gcc/rust/hir/tree/rust-hir-item.h | 2 ++ gcc/rust/hir/tree/rust-hir-path.h | 4 ++++ gcc/rust/hir/tree/rust-hir.h | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h index f72d8c8b0501..74450786e89a 100644 --- a/gcc/rust/hir/tree/rust-hir-item.h +++ b/gcc/rust/hir/tree/rust-hir-item.h @@ -443,6 +443,8 @@ public: // Returns whether the self-param has a valid lifetime. bool has_lifetime () const { return !lifetime.is_error (); } + const Lifetime &get_lifetime () const { return lifetime; } + // Returns whether the self-param is in an error state. bool is_error () const { return self_kind == ImplicitSelfKind::NONE; } diff --git a/gcc/rust/hir/tree/rust-hir-path.h b/gcc/rust/hir/tree/rust-hir-path.h index 9fe126a56a8d..0566e2e2a1cb 100644 --- a/gcc/rust/hir/tree/rust-hir-path.h +++ b/gcc/rust/hir/tree/rust-hir-path.h @@ -218,6 +218,10 @@ public: std::string as_string () const; std::vector &get_lifetime_args () { return lifetime_args; } + const std::vector &get_lifetime_args () const + { + return lifetime_args; + } std::vector > &get_type_args () { return type_args; } diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h index 0f2d52256d2f..f66f53fbd204 100644 --- a/gcc/rust/hir/tree/rust-hir.h +++ b/gcc/rust/hir/tree/rust-hir.h @@ -572,7 +572,10 @@ public: void accept_vis (HIRFullVisitor &vis) override; - std::string get_name () const { return lifetime_name; } + WARN_UNUSED_RESULT const std::string &get_name () const + { + return lifetime_name; + } AST::Lifetime::LifetimeType get_lifetime_type () const { @@ -662,6 +665,8 @@ public: // Returns whether the lifetime param has any lifetime bounds. bool has_lifetime_bounds () const { return !lifetime_bounds.empty (); } + std::vector &get_lifetime_bounds () { return lifetime_bounds; } + // Returns whether the lifetime param has an outer attribute. bool has_outer_attribute () const { return !outer_attr.is_empty (); }