gccrs: Fix bug with unconstrained const generic

philberty · philberty · commit 793fed853f96 · 2025-08-31T16:34:43.000Z
gcc/rust/ChangeLog:

	* typecheck/rust-hir-type-check-base.cc (walk_types_to_constrain): track the ref as well

Signed-off-by: Philip Herron &lt;herron.philip@googlemail.com&gt;
diff --git a/gcc/rust/typecheck/rust-hir-type-check-base.cc b/gcc/rust/typecheck/rust-hir-type-check-base.cc
@@ -56,7 +56,9 @@ walk_types_to_constrain (std::set<HirId> &constrained_symbols,
       if (arg != nullptr)
 	{
 	  const auto p = arg->get_root ();
+	  constrained_symbols.insert (p->get_ref ());
 	  constrained_symbols.insert (p->get_ty_ref ());
+
 	  if (p->has_substitutions_defined ())
 	    {
 	      walk_types_to_constrain (constrained_symbols,
@@ -164,8 +166,6 @@ TypeCheckBase::check_for_unconstrained (
       HirId ref = p.get_param_ty ()->get_ref ();
       symbols_to_constrain.insert (ref);
       symbol_to_location.insert ({ref, p.get_param_locus ()});
-
-      rust_debug_loc (p.get_param_locus (), "XX constrain THIS");
     }
 
   // set up the set of constrained symbols

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ walk_types_to_constrain (std::set<HirId> &constrained_symbols,`
`56`	`56`	`if (arg != nullptr)`
`57`	`57`	`{`
`58`	`58`	`const auto p = arg->get_root ();`
	`59`	`+ constrained_symbols.insert (p->get_ref ());`
`59`	`60`	`constrained_symbols.insert (p->get_ty_ref ());`
	`61`	`+`
`60`	`62`	`if (p->has_substitutions_defined ())`
`61`	`63`	`{`
`62`	`64`	`walk_types_to_constrain (constrained_symbols,`
`@@ -164,8 +166,6 @@ TypeCheckBase::check_for_unconstrained (`
`164`	`166`	`HirId ref = p.get_param_ty ()->get_ref ();`
`165`	`167`	`symbols_to_constrain.insert (ref);`
`166`	`168`	`symbol_to_location.insert ({ref, p.get_param_locus ()});`
`167`		`-`
`168`		`- rust_debug_loc (p.get_param_locus (), "XX constrain THIS");`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`// set up the set of constrained symbols`