simplified outdated condition in ClassBase.tp_clear

lostmsu · lostmsu · commit 74d87c5ce6c0 · 2021-10-29T19:09:34.000-07:00
diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -341,9 +341,9 @@ public static void tp_dealloc(NewReference lastRef)
 
             tp_clear(lastRef.Borrow());
 
-                IntPtr addr = lastRef.DangerousGetAddress();
-                bool deleted = CLRObject.reflectedObjects.Remove(addr);
-                Debug.Assert(deleted);
+            IntPtr addr = lastRef.DangerousGetAddress();
+            bool deleted = CLRObject.reflectedObjects.Remove(addr);
+            Debug.Assert(deleted);
 
             Runtime.PyObject_GC_UnTrack(lastRef.Borrow());
             Runtime.PyObject_GC_Del(lastRef.Steal());
@@ -353,17 +353,13 @@ public static void tp_dealloc(NewReference lastRef)
 
         public static int tp_clear(BorrowedReference ob)
         {
-            bool isTypeObject = Runtime.PyObject_TYPE(ob) == Runtime.PyCLRMetaType;
-            if (!isTypeObject)
+            int baseClearResult = BaseUnmanagedClear(ob);
+            if (baseClearResult != 0)
             {
-                int baseClearResult = BaseUnmanagedClear(ob);
-                if (baseClearResult != 0)
-                {
-                    return baseClearResult;
-                }
-
-                ClearObjectDict(ob);
+                return baseClearResult;
             }
+
+            ClearObjectDict(ob);
             return 0;
         }
 
