[gcc/devel/rust/master] remove decl mutability context which is unused

[gcc/devel/rust/master] remove decl mutability context which is unused

[Thomas Schwinge]

https://gcc.gnu.org/g:31e63dd6c2b4753d035496b9145e34b7b7d168c0

commit 31e63dd6c2b4753d035496b9145e34b7b7d168c0
Author: Philip Herron <philip.herron@embecosm.com>
Date:   Mon Jun 27 16:12:41 2022 +0100

    remove decl mutability context which is unused

Diff:
---
 gcc/rust/resolve/rust-ast-resolve-item.cc    |  8 --------
 gcc/rust/resolve/rust-ast-resolve-pattern.cc |  3 ---
 gcc/rust/resolve/rust-ast-resolve-pattern.h  |  5 -----
 gcc/rust/resolve/rust-ast-resolve-stmt.h     |  4 ----
 gcc/rust/resolve/rust-ast-resolve-toplevel.h |  2 --
 gcc/rust/resolve/rust-name-resolver.cc       | 15 ---------------
 gcc/rust/resolve/rust-name-resolver.h        |  6 ------
 7 files changed, 43 deletions(-)

diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc
index 1ec99d64090..7b0c31b2edc 100644
--- a/gcc/rust/resolve/rust-ast-resolve-item.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-item.cc
@@ -176,10 +176,6 @@ ResolveTraitItems::visit (AST::TraitItemConst &constant)
 
   if (constant.has_expr ())
     ResolveExpr::go (constant.get_expr ().get (), path, cpath);
-
-  // the mutability checker needs to verify for immutable decls the number
-  // of assignments are <1. This marks an implicit assignment
-  resolver->mark_decl_mutability (constant.get_node_id (), false);
 }
 
 ResolveItem::ResolveItem (const CanonicalPath &prefix,
@@ -500,10 +496,6 @@ ResolveItem::visit (AST::ConstantItem &constant)
 
   ResolveType::go (constant.get_type ().get (), constant.get_node_id ());
   ResolveExpr::go (constant.get_expr ().get (), path, cpath);
-
-  // the mutability checker needs to verify for immutable decls the number
-  // of assignments are <1. This marks an implicit assignment
-  resolver->mark_decl_mutability (constant.get_node_id (), false);
 }
 
 void
diff --git a/gcc/rust/resolve/rust-ast-resolve-pattern.cc b/gcc/rust/resolve/rust-ast-resolve-pattern.cc
index 47d85fb523f..9386d36d25e 100644
--- a/gcc/rust/resolve/rust-ast-resolve-pattern.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-pattern.cc
@@ -86,9 +86,6 @@ PatternDeclaration::visit (AST::StructPattern &pattern)
 	      CanonicalPath::new_seg (ident.get_node_id (),
 				      ident.get_identifier ()),
 	      ident.get_node_id (), ident.get_locus ());
-
-	    resolver->mark_decl_mutability (ident.get_node_id (),
-					    ident.is_mut ());
 	  }
 	  break;
 	}
diff --git a/gcc/rust/resolve/rust-ast-resolve-pattern.h b/gcc/rust/resolve/rust-ast-resolve-pattern.h
index 038c8468a54..fcbb23fdf08 100644
--- a/gcc/rust/resolve/rust-ast-resolve-pattern.h
+++ b/gcc/rust/resolve/rust-ast-resolve-pattern.h
@@ -68,9 +68,6 @@ public:
     resolver->get_name_scope ().insert (
       CanonicalPath::new_seg (pattern.get_node_id (), pattern.get_ident ()),
       pattern.get_node_id (), pattern.get_locus ());
-
-    resolver->mark_decl_mutability (pattern.get_node_id (),
-				    pattern.get_is_mut ());
   }
 
   void visit (AST::WildcardPattern &pattern) override
@@ -78,8 +75,6 @@ public:
     resolver->get_name_scope ().insert (
       CanonicalPath::new_seg (pattern.get_node_id (), "_"),
       pattern.get_node_id (), pattern.get_locus ());
-
-    resolver->mark_decl_mutability (pattern.get_node_id (), false);
   }
 
   // cases in a match expression
diff --git a/gcc/rust/resolve/rust-ast-resolve-stmt.h b/gcc/rust/resolve/rust-ast-resolve-stmt.h
index 81172d5b2bd..95c25a5ad77 100644
--- a/gcc/rust/resolve/rust-ast-resolve-stmt.h
+++ b/gcc/rust/resolve/rust-ast-resolve-stmt.h
@@ -72,10 +72,6 @@ public:
 
     ResolveType::go (constant.get_type ().get (), constant.get_node_id ());
     ResolveExpr::go (constant.get_expr ().get (), prefix, canonical_prefix);
-
-    // the mutability checker needs to verify for immutable decls the number
-    // of assignments are <1. This marks an implicit assignment
-    resolver->mark_decl_mutability (constant.get_node_id (), false);
   }
 
   void visit (AST::LetStmt &stmt) override
diff --git a/gcc/rust/resolve/rust-ast-resolve-toplevel.h b/gcc/rust/resolve/rust-ast-resolve-toplevel.h
index e0928f5de07..c495786f6f8 100644
--- a/gcc/rust/resolve/rust-ast-resolve-toplevel.h
+++ b/gcc/rust/resolve/rust-ast-resolve-toplevel.h
@@ -275,8 +275,6 @@ public:
 	rust_error_at (r, "redefined multiple times");
       });
 
-    resolver->mark_decl_mutability (var.get_node_id (), var.is_mutable ());
-
     NodeId current_module = resolver->peek_current_module_scope ();
     mappings->insert_module_child_item (current_module, decl);
     mappings->insert_canonical_path (mappings->get_current_crate (),
diff --git a/gcc/rust/resolve/rust-name-resolver.cc b/gcc/rust/resolve/rust-name-resolver.cc
index 0ef6f5319f5..a788914da0d 100644
--- a/gcc/rust/resolve/rust-name-resolver.cc
+++ b/gcc/rust/resolve/rust-name-resolver.cc
@@ -482,20 +482,5 @@ Resolver::lookup_resolved_macro (NodeId refId, NodeId *defId)
   return true;
 }
 
-void
-Resolver::mark_decl_mutability (NodeId id, bool mut)
-{
-  rust_assert (decl_mutability.find (id) == decl_mutability.end ());
-  decl_mutability[id] = mut;
-}
-
-bool
-Resolver::decl_is_mutable (NodeId id) const
-{
-  auto it = decl_mutability.find (id);
-  rust_assert (it != decl_mutability.end ());
-  return it->second;
-}
-
 } // namespace Resolver
 } // namespace Rust
diff --git a/gcc/rust/resolve/rust-name-resolver.h b/gcc/rust/resolve/rust-name-resolver.h
index ad785e11a68..e9f7c621a47 100644
--- a/gcc/rust/resolve/rust-name-resolver.h
+++ b/gcc/rust/resolve/rust-name-resolver.h
@@ -124,9 +124,6 @@ public:
   void insert_resolved_macro (NodeId refId, NodeId defId);
   bool lookup_resolved_macro (NodeId refId, NodeId *defId);
 
-  void mark_decl_mutability (NodeId id, bool mut);
-  bool decl_is_mutable (NodeId id) const;
-
   // proxy for scoping
   Scope &get_name_scope () { return name_scope; }
   Scope &get_type_scope () { return type_scope; }
@@ -203,9 +200,6 @@ private:
   std::map<NodeId, NodeId> resolved_labels;
   std::map<NodeId, NodeId> resolved_macros;
 
-  // map of resolved names mutability flag
-  std::map<NodeId, bool> decl_mutability;
-
   // keep track of the current module scope ids
   std::vector<NodeId> current_module_stack;
 };