gccrs: Remove cmp_autoderef_mode hack from old autoderef

Signed-off-by: Philip Herron <[email protected]>

gcc/rust/ChangeLog:

	* typecheck/rust-tyty-cmp.h: remove
	* typecheck/rust-tyty.cc (set_cmp_autoderef_mode): likewise
	(reset_cmp_autoderef_mode): likewise
	* typecheck/rust-tyty.h (set_cmp_autoderef_mode): likewise
	(reset_cmp_autoderef_mode): likewise

Author: philberty

gcc/rust/typecheck/rust-tyty-cmp.h

@@ -28,10 +28,6 @@
 namespace Rust {
 namespace TyTy {
 
-// we need to fix this properly by implementing the match for assembling
-// candidates
-extern bool autoderef_cmp_flag;
-
 class BaseCmp : public TyConstVisitor
 {
 public:
@@ -1271,9 +1267,6 @@ class ReferenceCmp : public BaseCmp
     auto other_base_type = type.get_base ();
 
     bool mutability_ok = base->is_mutable () ? type.is_mutable () : true;
-    if (autoderef_cmp_flag)
-      mutability_ok = base->mutability () == type.mutability ();
-
     if (!mutability_ok)
       {
 	BaseCmp::visit (type);
@@ -1320,9 +1313,6 @@ class PointerCmp : public BaseCmp
     auto other_base_type = type.get_base ();
 
     bool mutability_ok = base->is_mutable () ? type.is_mutable () : true;
-    if (autoderef_cmp_flag)
-      mutability_ok = base->mutability () == type.mutability ();
-
     if (!mutability_ok)
       {
 	BaseCmp::visit (type);
@@ -1401,7 +1391,7 @@ class ParamCmp : public BaseCmp
 
   void visit (const ArrayType &) override { ok = true; }
 
-  void visit (const SliceType &) override { ok = !autoderef_cmp_flag; }
+  void visit (const SliceType &) override { ok = true; }
 
   void visit (const BoolType &) override { ok = true; }
 

gcc/rust/typecheck/rust-tyty.cc

@@ -38,19 +38,6 @@
 namespace Rust {
 namespace TyTy {
 
-bool autoderef_cmp_flag = false;
-
-void
-set_cmp_autoderef_mode ()
-{
-  autoderef_cmp_flag = true;
-}
-void
-reset_cmp_autoderef_mode ()
-{
-  autoderef_cmp_flag = false;
-}
-
 std::string
 TypeKindFormat::to_string (TypeKind kind)
 {

gcc/rust/typecheck/rust-tyty.h

@@ -77,11 +77,6 @@ class TypeKindFormat
   static std::string to_string (TypeKind kind);
 };
 
-extern void
-set_cmp_autoderef_mode ();
-extern void
-reset_cmp_autoderef_mode ();
-
 class TyVisitor;
 class TyConstVisitor;
 class BaseType : public TypeBoundsMappings