From: Philip Herron <herron.philip@googlemail.com>
Date: Mon, 17 Apr 2023 21:04:11 +0000 (+0100)
Subject: gccrs: add helper to check for a const or static context
X-Git-Tag: basepoints/gcc-15~2623
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c6338ddb64b8a3fc24470b3040e09ade2f772d8;p=thirdparty%2Fgcc.git

gccrs: add helper to check for a const or static context

gcc/rust/ChangeLog:

	* typecheck/rust-hir-type-check.h: new helper
	* typecheck/rust-typecheck-context.cc (TypeCheckContext::have_function_context):
	implementation

Signed-off-by: Philip Herron <herron.philip@googlemail.com>
---

diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h
index 3f43bc89d6fd..6fa75ecdc335 100644
--- a/gcc/rust/typecheck/rust-hir-type-check.h
+++ b/gcc/rust/typecheck/rust-hir-type-check.h
@@ -91,6 +91,7 @@ public:
   void insert_type_by_node_id (NodeId ref, HirId id);
   bool lookup_type_by_node_id (NodeId ref, HirId *id);
 
+  bool have_function_context () const;
   TyTy::BaseType *peek_return_type ();
   TypeCheckContextItem peek_context ();
   void push_return_type (TypeCheckContextItem item,
diff --git a/gcc/rust/typecheck/rust-typecheck-context.cc b/gcc/rust/typecheck/rust-typecheck-context.cc
index 7c0dc06372d0..5d050218dc7b 100644
--- a/gcc/rust/typecheck/rust-typecheck-context.cc
+++ b/gcc/rust/typecheck/rust-typecheck-context.cc
@@ -136,6 +136,12 @@ TypeCheckContext::lookup_type_by_node_id (NodeId ref, HirId *id)
   return true;
 }
 
+bool
+TypeCheckContext::have_function_context () const
+{
+  return !return_type_stack.empty ();
+}
+
 TyTy::BaseType *
 TypeCheckContext::peek_return_type ()
 {