From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id 9C5F3385783F for ; Tue, 30 Jan 2024 12:11:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C5F3385783F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9C5F3385783F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::133 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616743; cv=none; b=XttSexENEj6DK3XgUqWl7VpmutrEHo71DZIpnQy8eXf7sRfYn7jxurCbEvA92izF/Iz1IDiKwcQ83RQBRlRaZzeug/7b+21kBY00MB6V2t1+TJk39svCMtigL+dAqNYeR1CsfXtwS2F11Cko/mkIEGKn2LvQnLHuSEERQ3VueZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616743; c=relaxed/simple; bh=AlrBgbIzwOz/dsUBJ9lGWp/ivNJicnFjb05dFDdxKBk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=fjVqKgG0FWH/EzMwq2T0f1gDe6TcTBhWwydDW789685dReE19j4gIgf6ycwiaOkfu9rMZl7709LXtS0MaZETziOSR4Y+TxBPA4MYB1hLEh1eXhrtmVjQMKSr9PIRHkusn4JkZwv4zI7Q35VQEMCojdGrno8KZA6G2dSFUpYgULw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-510322d5275so4174966e87.1 for ; Tue, 30 Jan 2024 04:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616703; x=1707221503; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=xRFapfmaqT8Fwfh6VKPWHVph7SfMdQ5TBMshjeLpkmw=; b=PANJxFjnio1d6MRZ1JbLgPA0Ps1z/oC0pS3opnI2WBCadT9qctAOj/Ka4QaCGrvP+n IpIZrP5j60hgX8Yq6KssdFudZ7v4aNvqW+ye0Je27PcJVyDS/N2AfugmsAw0H0aAuJy7 5p6nEQcDvnTbKwd1shc66jmJjWQalTqRI6vZHUgyJpnt9nZ0z9boo6HQ2LeM/0GtlIdr UeGtOP4w/1YBB6060O//HOXCVM1cyWML/zGvyZrdTEaQSjufWIzYcV4FJGW7tOSUmKjA dxrGRPIibBmu8TzfJx++DJhleuZjTQMREFaf2buOWEWnwXLjE0+DHu0DDbhX95akja6j ZLyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616703; x=1707221503; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xRFapfmaqT8Fwfh6VKPWHVph7SfMdQ5TBMshjeLpkmw=; b=lM/vt7xcIgVWp/mfk2bKJCQ6tmQpQpEfLv0Q1CoiE+t41y9R1fTVCBI6LHBYmBRFXx w8UIjPFrqr1s5BVAe11AgrXkHfAhqNNsNvRwQSb/QrqKRnPfVe/5aLpZvVqinka6pPeH AQAoQS/i8YSWcyCnadrgLifJKemwdGdemVZXQIqQGYWhjiPyRy3iRdYxa7PyaumR7dnX UwwIDOaB6PdTMUeQOXRWR4Zx+QNHzt/hZCd155WfyzQBm/D+t9NX+EeAi1rDHv5F0OXz YUU1ohUpGcdvCy0CzltCwzlorFRZbUfjgszYJ0XDbtS5qK51R27yNgsZFI9EGMUL+Tow M7Cg== X-Gm-Message-State: AOJu0Yy54oQuHBOpP8bT1aju3bvgdDFa6VfwXJiOv9guAHf3cQJ5dNBw e60lQos3auyeMziNndYW92N8jtX+C31i48hFwV68ATHOjsEOBsWxQ6fEXqk8uYCTL4bLaZsYVT1 1/A== X-Google-Smtp-Source: AGHT+IFL3hPsJ1gNGrYnv/HWvPJhKguomauIiSAKj+yNNkV2DRdjCcsd20n4JTZ1klIjmZS5MTGBvQ== X-Received: by 2002:ac2:562e:0:b0:50e:cbf3:8f73 with SMTP id b14-20020ac2562e000000b0050ecbf38f73mr6863890lff.52.1706616702978; Tue, 30 Jan 2024 04:11:42 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:42 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [COMMITTED 072/101] gccrs: HIR: add missing getters Date: Tue, 30 Jan 2024 13:07:28 +0100 Message-ID: <20240130121026.807464-75-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.1 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,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: Jakub Dupak 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 --- 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 f72d8c8b050..74450786e89 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 9fe126a56a8..0566e2e2a1c 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 0f2d52256d2..f66f53fbd20 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 (); } -- 2.42.1