https://gcc.gnu.org/g:30b2e9c84d782d5494d645d2005fd0da55553b15
commit 30b2e9c84d782d5494d645d2005fd0da55553b15
Author: Jakub Dupak <d...@jakubdupak.com>
Date: Mon Dec 11 21:52:48 2023 +0100
BIR: Fix missed nodiscard
gcc/rust/ChangeLog:
* checks/errors/borrowck/rust-bir-builder-internal.h: Replace
nodiscard.
* checks/errors/borrowck/rust-bir-place.h: Replace nodiscard.
Signed-off-by: Jakub Dupak <d...@jakubdupak.com>
Diff:
---
gcc/rust/checks/errors/borrowck/rust-bir-builder-internal.h | 4 ++--
gcc/rust/checks/errors/borrowck/rust-bir-place.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-builder-internal.h
b/gcc/rust/checks/errors/borrowck/rust-bir-builder-internal.h
index f33eb0752446..cd6115147766 100644
--- a/gcc/rust/checks/errors/borrowck/rust-bir-builder-internal.h
+++ b/gcc/rust/checks/errors/borrowck/rust-bir-builder-internal.h
@@ -261,12 +261,12 @@ protected: // CFG helpers
protected: // HIR resolution helpers
template <typename T>
- [[nodiscard]] TyTy::BaseType *lookup_type (T &hir_node) const
+ WARN_UNUSED_RESULT TyTy::BaseType *lookup_type (T &hir_node) const
{
return lookup_type (hir_node.get_mappings ().get_hirid ());
}
- [[nodiscard]] TyTy::BaseType *lookup_type (HirId hirid) const
+ WARN_UNUSED_RESULT TyTy::BaseType *lookup_type (HirId hirid) const
{
TyTy::BaseType *type = nullptr;
bool ok = ctx.tyctx.lookup_type (hirid, &type);
diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-place.h
b/gcc/rust/checks/errors/borrowck/rust-bir-place.h
index 66b131dee1a7..8c2df47c11d1 100644
--- a/gcc/rust/checks/errors/borrowck/rust-bir-place.h
+++ b/gcc/rust/checks/errors/borrowck/rust-bir-place.h
@@ -148,9 +148,9 @@ public:
0);
}
- [[nodiscard]] PlaceId lookup_or_add_path (Place::Kind kind,
- TyTy::BaseType *tyty,
- PlaceId parent, size_t id = 0)
+ WARN_UNUSED_RESULT PlaceId lookup_or_add_path (Place::Kind kind,
+ TyTy::BaseType *tyty,
+ PlaceId parent, size_t id = 0)
{
PlaceId current = 0;
if (parent < places.size ())
