use HasFlag

koubaa · koubaa · commit 7f576cfc8dc5 · 2020-09-16T19:42:01.000-05:00
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -11,8 +11,8 @@ internal CLRObject(object ob, IntPtr tp)
         {
             IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);
 
-            long flags = Util.ReadCLong(tp, TypeOffset.tp_flags);
-            if ((flags & (int)TypeFlags.Subclass) != 0)
+            var flags = (TypeFlags)Util.ReadCLong(tp, TypeOffset.tp_flags);
+            if (flags.HasFlag(TypeFlags.Subclass))
             {
                 IntPtr dict = Marshal.ReadIntPtr(py, ObjectOffset.TypeDictOffset(tp));
                 if (dict == IntPtr.Zero)
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -67,11 +67,8 @@ internal static bool IsManagedType(IntPtr ob)
                     tp = ob;
                 }
 
-                var flags = Util.ReadCLong(tp, TypeOffset.tp_flags);
-                if ((flags & (int)TypeFlags.Managed) != 0)
-                {
-                    return true;
-                }
+                var flags = (TypeFlags)Util.ReadCLong(tp, TypeOffset.tp_flags);
+                return flags.HasFlag(TypeFlags.Managed);
             }
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ internal CLRObject(object ob, IntPtr tp)`
`11`	`11`	`{`
`12`	`12`	`IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);`
`13`	`13`
`14`		`- long flags = Util.ReadCLong(tp, TypeOffset.tp_flags);`
`15`		`- if ((flags & (int)TypeFlags.Subclass) != 0)`
	`14`	`+ var flags = (TypeFlags)Util.ReadCLong(tp, TypeOffset.tp_flags);`
	`15`	`+ if (flags.HasFlag(TypeFlags.Subclass))`
`16`	`16`	`{`
`17`	`17`	`IntPtr dict = Marshal.ReadIntPtr(py, ObjectOffset.TypeDictOffset(tp));`
`18`	`18`	`if (dict == IntPtr.Zero)`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,8 @@ internal static bool IsManagedType(IntPtr ob)`
`67`	`67`	`tp = ob;`
`68`	`68`	`}`
`69`	`69`
`70`		`- var flags = Util.ReadCLong(tp, TypeOffset.tp_flags);`
`71`		`- if ((flags & (int)TypeFlags.Managed) != 0)`
`72`		`- {`
`73`		`- return true;`
`74`		`- }`
	`70`	`+ var flags = (TypeFlags)Util.ReadCLong(tp, TypeOffset.tp_flags);`
	`71`	`+ return flags.HasFlag(TypeFlags.Managed);`
`75`	`72`	`}`
`76`	`73`	`return false;`
`77`	`74`	`}`