Cast IntPtr to int on 32bit, float on 64

vmuriart · vmuriart · commit 760b2b1097b4 · 2017-02-28T11:49:15.000-07:00
Similar operation is done in runtime.cs xDecref
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs
@@ -53,8 +53,7 @@ public static void LoadSpecificArgs()
         /// More complex version of StartAndStopTwice test
         /// </summary>
         [Test]
-        [Ignore("GH#376: System.OverflowException : Arithmetic operation resulted in an overflow")]
-        //[Ignore("System.ArgumentException : Cannot pass a GCHandle across AppDomains")]
+        [Ignore("System.ArgumentException : Cannot pass a GCHandle across AppDomains")]
         public void ReInitialize()
         {
             var code = "from System import Int32\n";
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -11,8 +11,19 @@ internal CLRObject(object ob, IntPtr tp)
         {
             IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);
 
-            var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
-            if ((flags & TypeFlags.Subclass) != 0)
+            bool bFlag;
+            if (Runtime.Is32Bit)
+            {
+                var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                bFlag = (flags & TypeFlags.Subclass) != 0;
+            }
+            else
+            {
+                var flags = (float)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                bFlag = (flags & TypeFlags.Subclass) != 0;
+            }
+
+            if (bFlag)
             {
                 IntPtr dict = Marshal.ReadIntPtr(py, ObjectOffset.DictOffset(tp));
                 if (dict == IntPtr.Zero)
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -28,8 +28,19 @@ internal static ManagedType GetManagedObject(IntPtr ob)
                     tp = ob;
                 }
 
-                var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
-                if ((flags & TypeFlags.Managed) != 0)
+                bool bFlag;
+                if (Runtime.Is32Bit)
+                {
+                    var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                    bFlag = (flags & TypeFlags.Managed) != 0;
+                }
+                else
+                {
+                    var flags = (float)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                    bFlag = (flags & TypeFlags.Managed) != 0;
+                }
+
+                if (bFlag)
                 {
                     IntPtr op = tp == ob
                         ? Marshal.ReadIntPtr(tp, TypeOffset.magic())
@@ -63,8 +74,19 @@ internal static bool IsManagedType(IntPtr ob)
                     tp = ob;
                 }
 
-                var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
-                if ((flags & TypeFlags.Managed) != 0)
+                bool bFlag;
+                if (Runtime.Is32Bit)
+                {
+                    var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                    bFlag = (flags & TypeFlags.Managed) != 0;
+                }
+                else
+                {
+                    var flags = (float)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                    bFlag = (flags & TypeFlags.Managed) != 0;
+                }
+
+                if (bFlag)
                 {
                     return true;
                 }
