Merge #650

650: Stop shadowing of hir mappings with substitution mappings r=philberty a=philberty

There was a hidden segv nullptr in the check for unconstrained
type parameters. Since the util mappings class name is being shadowed
by the substitution mappings we never actually hit the segv. As part
of my work in traits and qualified paths we need access to the hir mappings
class which was shadowed. This removes shadowing and fixes the segv
for unconstrained type parameters.

Co-authored-by: Philip Herron <philip.herron@embecosm.com>

1 files changed, 14 insertions, 9 deletions

diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.h b/gcc/rust/typecheck/rust-hir-type-check-type.h
index 0cc1cfb..15eab25 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-type.h
+++ b/gcc/rust/typecheck/rust-hir-type-check-type.h
@@ -60,9 +60,10 @@ class TypeCheckType : public TypeCheckBase
 public:
   static TyTy::BaseType *
   Resolve (HIR::Type *type,
-	   std::vector<TyTy::SubstitutionParamMapping> *mappings = nullptr)
+	   std::vector<TyTy::SubstitutionParamMapping> *subst_mappings
+	   = nullptr)
   {
-    TypeCheckType resolver (mappings);
+    TypeCheckType resolver (subst_mappings);
     type->accept_vis (resolver);
 
     if (resolver.translated == nullptr)
@@ -210,8 +211,8 @@ public:
   }
 
 private:
-  TypeCheckType (std::vector<TyTy::SubstitutionParamMapping> *mappings)
-    : TypeCheckBase (), mappings (mappings), translated (nullptr)
+  TypeCheckType (std::vector<TyTy::SubstitutionParamMapping> *subst_mappings)
+    : TypeCheckBase (), subst_mappings (subst_mappings), translated (nullptr)
   {}
 
   void
@@ -219,11 +220,15 @@ private:
   {
     std::map<std::string, Location> param_location_map;
     std::set<std::string> param_tys;
-    for (auto &mapping : *mappings)
+
+    if (subst_mappings != nullptr)
       {
-	std::string sym = mapping.get_param_ty ()->get_symbol ();
-	param_tys.insert (sym);
-	param_location_map[sym] = mapping.get_generic_param ().get_locus ();
+	for (auto &mapping : *subst_mappings)
+	  {
+	    std::string sym = mapping.get_param_ty ()->get_symbol ();
+	    param_tys.insert (sym);
+	    param_location_map[sym] = mapping.get_generic_param ().get_locus ();
+	  }
       }
 
     std::set<std::string> args;
@@ -241,7 +246,7 @@ private:
       }
   }
 
-  std::vector<TyTy::SubstitutionParamMapping> *mappings;
+  std::vector<TyTy::SubstitutionParamMapping> *subst_mappings;
   TyTy::BaseType *translated;
 };