From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Wed, 3 Jun 2026 09:35:48 +0000 (+0200)
Subject: gccrs: compile-expr: Rename lookup_temp_var
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c352bb8cf5b91e7754f0da024d82d4825598c3fa;p=thirdparty%2Fgcc.git

gccrs: compile-expr: Rename lookup_temp_var

Since this function is only used in a labels context, let's make it clearer.

gcc/rust/ChangeLog:

	* backend/rust-compile-expr.cc (CompileExpr::visit): Call the new name.
	(CompileExpr::lookup_temp_var): Rename it to...
	(CompileExpr::lookup_label_temp_var): ...this.
	* backend/rust-compile-expr.h: Likewise.
---

diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 5dac2439cd7..36c088e8eaf 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -867,7 +867,7 @@ CompileExpr::visit (HIR::BreakExpr &expr)
   if (expr.has_break_expr () && expr.has_label ())
     {
       HIR::Lifetime &label = expr.get_label ();
-      auto tvar = lookup_temp_var (label.get_mappings ().get_nodeid ());
+      auto tvar = lookup_label_temp_var (label.get_mappings ().get_nodeid ());
       tree value = CompileExpr::Compile (expr.get_expr (), ctx);
       tree assign
 	= Backend::assignment_statement (tvar->get_tree (label.get_locus ()),
@@ -2811,7 +2811,7 @@ CompileExpr::lookup_label (NodeId to_be_resolved)
 }
 
 Bvariable *
-CompileExpr::lookup_temp_var (NodeId to_be_resolved)
+CompileExpr::lookup_label_temp_var (NodeId to_be_resolved)
 {
   // TODO: Not sure that this temp var should have been inserted in the Labels
   // namespace? Why not values?
diff --git a/gcc/rust/backend/rust-compile-expr.h b/gcc/rust/backend/rust-compile-expr.h
index 9d1238e12fc..63ada9f33a6 100644
--- a/gcc/rust/backend/rust-compile-expr.h
+++ b/gcc/rust/backend/rust-compile-expr.h
@@ -156,7 +156,7 @@ protected:
 
   tree construct_block_label (HIR::BlockExpr &expr);
   tree lookup_label (NodeId to_be_resolved);
-  Bvariable *lookup_temp_var (NodeId to_be_resolved);
+  Bvariable *lookup_label_temp_var (NodeId to_be_resolved);
   HirId resolve_nodeid (NodeId to_be_resolved, Resolver2_0::Namespace ns);
 
 private: