[committed 096/103] gccrs: Add capture tracking to the type info for closures

[arthur . cohen]

From: Philip Herron <philip.her...@embecosm.com>

gcc/rust/ChangeLog:

        * typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit): Pass 
captures
        properly to `TyTy::ClosureType` constructor.
        * typecheck/rust-tyty.cc (ClosureType::as_string): Fix string 
representation.
        (ClosureType::clone): Pass `captures` argument.
        * typecheck/rust-tyty.h: Add `captures` field.
---
 gcc/rust/typecheck/rust-hir-type-check-expr.cc |  4 +++-
 gcc/rust/typecheck/rust-tyty.cc                |  5 ++---
 gcc/rust/typecheck/rust-tyty.h                 | 11 +++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc 
b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
index 85590630378..0b0db3296a0 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
@@ -1492,8 +1492,10 @@ TypeCheckExpr::visit (HIR::ClosureExpr &expr)
                 expr.get_locus ());
 
   // generate the closure type
+  NodeId closure_node_id = expr.get_mappings ().get_nodeid ();
+  const std::set<NodeId> &captures = resolver->get_captures (closure_node_id);
   infered = new TyTy::ClosureType (ref, id, ident, closure_args, result_type,
-                                  subst_refs);
+                                  subst_refs, captures);
 
   // FIXME
   // all closures automatically inherit the appropriate fn trait. Lets just
diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc
index bdb2d909b86..71f0de1bbab 100644
--- a/gcc/rust/typecheck/rust-tyty.cc
+++ b/gcc/rust/typecheck/rust-tyty.cc
@@ -1675,8 +1675,7 @@ std::string
 ClosureType::as_string () const
 {
   std::string params_buf = parameters->as_string ();
-  return "|" + params_buf + "| {" + result_type.get_tyty ()->as_string ()
-        + "} {" + raw_bounds_as_string () + "}";
+  return "|" + params_buf + "| {" + result_type.get_tyty ()->as_string () + 
"}";
 }
 
 BaseType *
@@ -1714,7 +1713,7 @@ ClosureType::clone () const
 {
   return new ClosureType (get_ref (), get_ty_ref (), ident, id,
                          (TyTy::TupleType *) parameters->clone (), result_type,
-                         clone_substs (), get_combined_refs (),
+                         clone_substs (), captures, get_combined_refs (),
                          specified_bounds);
 }
 
diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h
index 5eaec352567..b9a1fdfa5c7 100644
--- a/gcc/rust/typecheck/rust-tyty.h
+++ b/gcc/rust/typecheck/rust-tyty.h
@@ -1628,13 +1628,15 @@ public:
   ClosureType (HirId ref, DefId id, RustIdent ident,
               TyTy::TupleType *parameters, TyVar result_type,
               std::vector<SubstitutionParamMapping> subst_refs,
+              std::set<NodeId> captures,
               std::set<HirId> refs = std::set<HirId> (),
               std::vector<TypeBoundPredicate> specified_bounds
               = std::vector<TypeBoundPredicate> ())
     : BaseType (ref, ref, TypeKind::CLOSURE, ident, refs),
       SubstitutionRef (std::move (subst_refs),
                       SubstitutionArgumentMappings::error ()),
-      parameters (parameters), result_type (std::move (result_type)), id (id)
+      parameters (parameters), result_type (std::move (result_type)), id (id),
+      captures (captures)
   {
     LocalDefId local_def_id = id.localDefId;
     rust_assert (local_def_id != UNKNOWN_LOCAL_DEFID);
@@ -1644,13 +1646,15 @@ public:
   ClosureType (HirId ref, HirId ty_ref, RustIdent ident, DefId id,
               TyTy::TupleType *parameters, TyVar result_type,
               std::vector<SubstitutionParamMapping> subst_refs,
+              std::set<NodeId> captures,
               std::set<HirId> refs = std::set<HirId> (),
               std::vector<TypeBoundPredicate> specified_bounds
               = std::vector<TypeBoundPredicate> ())
     : BaseType (ref, ty_ref, TypeKind::CLOSURE, ident, refs),
       SubstitutionRef (std::move (subst_refs),
                       SubstitutionArgumentMappings::error ()),
-      parameters (parameters), result_type (std::move (result_type)), id (id)
+      parameters (parameters), result_type (std::move (result_type)), id (id),
+      captures (captures)
   {
     LocalDefId local_def_id = id.localDefId;
     rust_assert (local_def_id != UNKNOWN_LOCAL_DEFID);
@@ -1699,10 +1703,13 @@ public:
 
   void setup_fn_once_output () const;
 
+  const std::set<NodeId> &get_captures () const { return captures; }
+
 private:
   TyTy::TupleType *parameters;
   TyVar result_type;
   DefId id;
+  std::set<NodeId> captures;
 };
 
 class ArrayType : public BaseType
-- 
2.39.1