Apply Reference type usage

amos402 · amos402 · commit 35cbe55b2859 · 2020-02-27T18:26:33.000+08:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -446,18 +446,18 @@ private static void ClearClrModules()
         {
             var modules = PyImport_GetModuleDict();
             var items = PyDict_Items(modules);
-            long length = PyList_Size(items);
+            long length = PyList_Size(items.DangerousGetAddress());
             for (long i = 0; i < length; i++)
             {
-                var item = PyList_GetItem(items, i);
-                var name = PyTuple_GetItem(item, 0);
-                var module = PyTuple_GetItem(item, 1);
+                var item = PyList_GetItem(items.DangerousGetAddress(), i);
+                var name = PyTuple_GetItem(item.DangerousGetAddress(), 0);
+                var module = PyTuple_GetItem(item.DangerousGetAddress(), 1);
                 if (ManagedType.IsManagedType(module))
                 {
                     PyDict_DelItem(modules, name);
                 }
             }
-            XDecref(items);
+            items.Dispose();
         }
 
         private static void RemoveClrRootModule()
diff --git a/src/runtime/runtime_data.cs b/src/runtime/runtime_data.cs
@@ -224,22 +224,23 @@ private static void StashPopObjects(RuntimeDataStorage storage)
         private static void StashPushModules(RuntimeDataStorage storage)
         {
             var pyModules = PyImport_GetModuleDict();
-            var items = PyDict_Items(pyModules);
+            var itemsRef = PyDict_Items(pyModules);
+            var items = itemsRef.DangerousGetAddress();
             long length = PyList_Size(items);
             var modules = new Dictionary<IntPtr, IntPtr>(); ;
             for (long i = 0; i < length; i++)
             {
                 var item = PyList_GetItem(items, i);
-                var name = PyTuple_GetItem(item, 0);
-                var module = PyTuple_GetItem(item, 1);
+                var name = PyTuple_GetItem(item.DangerousGetAddress(), 0);
+                var module = PyTuple_GetItem(item.DangerousGetAddress(), 1);
                 if (ManagedType.IsManagedType(module))
                 {
                     XIncref(name);
                     XIncref(module);
                     modules.Add(name, module);
                 }
             }
-            XDecref(items);
+            itemsRef.Dispose();
             storage.AddValue("modules", modules);
         }
 
diff --git a/src/runtime/runtime_state.cs b/src/runtime/runtime_state.cs
@@ -152,7 +152,7 @@ public static IEnumerable<IntPtr> PyGCGetObjects()
             for (long i = 0; i < length; i++)
             {
                 var obj = PyList_GetItem(objs, i);
-                yield return obj;
+                yield return obj.DangerousGetAddress();
             }
             XDecref(objs);
             XDecref(gc);
@@ -166,7 +166,7 @@ public static IEnumerable<IntPtr> GetModuleNames()
             for (int i = 0; i < length; i++)
             {
                 var name = PyList_GetItem(names, i);
-                yield return name;
+                yield return name.DangerousGetAddress();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -446,18 +446,18 @@ private static void ClearClrModules()`
`446`	`446`	`{`
`447`	`447`	`var modules = PyImport_GetModuleDict();`
`448`	`448`	`var items = PyDict_Items(modules);`
`449`		`- long length = PyList_Size(items);`
	`449`	`+ long length = PyList_Size(items.DangerousGetAddress());`
`450`	`450`	`for (long i = 0; i < length; i++)`
`451`	`451`	`{`
`452`		`- var item = PyList_GetItem(items, i);`
`453`		`- var name = PyTuple_GetItem(item, 0);`
`454`		`- var module = PyTuple_GetItem(item, 1);`
	`452`	`+ var item = PyList_GetItem(items.DangerousGetAddress(), i);`
	`453`	`+ var name = PyTuple_GetItem(item.DangerousGetAddress(), 0);`
	`454`	`+ var module = PyTuple_GetItem(item.DangerousGetAddress(), 1);`
`455`	`455`	`if (ManagedType.IsManagedType(module))`
`456`	`456`	`{`
`457`	`457`	`PyDict_DelItem(modules, name);`
`458`	`458`	`}`
`459`	`459`	`}`
`460`		`- XDecref(items);`
	`460`	`+ items.Dispose();`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`private static void RemoveClrRootModule()`
Original file line number	Diff line number	Diff line change
`@@ -224,22 +224,23 @@ private static void StashPopObjects(RuntimeDataStorage storage)`
`224`	`224`	`private static void StashPushModules(RuntimeDataStorage storage)`
`225`	`225`	`{`
`226`	`226`	`var pyModules = PyImport_GetModuleDict();`
`227`		`- var items = PyDict_Items(pyModules);`
	`227`	`+ var itemsRef = PyDict_Items(pyModules);`
	`228`	`+ var items = itemsRef.DangerousGetAddress();`
`228`	`229`	`long length = PyList_Size(items);`
`229`	`230`	`var modules = new Dictionary<IntPtr, IntPtr>(); ;`
`230`	`231`	`for (long i = 0; i < length; i++)`
`231`	`232`	`{`
`232`	`233`	`var item = PyList_GetItem(items, i);`
`233`		`- var name = PyTuple_GetItem(item, 0);`
`234`		`- var module = PyTuple_GetItem(item, 1);`
	`234`	`+ var name = PyTuple_GetItem(item.DangerousGetAddress(), 0);`
	`235`	`+ var module = PyTuple_GetItem(item.DangerousGetAddress(), 1);`
`235`	`236`	`if (ManagedType.IsManagedType(module))`
`236`	`237`	`{`
`237`	`238`	`XIncref(name);`
`238`	`239`	`XIncref(module);`
`239`	`240`	`modules.Add(name, module);`
`240`	`241`	`}`
`241`	`242`	`}`
`242`		`- XDecref(items);`
	`243`	`+ itemsRef.Dispose();`
`243`	`244`	`storage.AddValue("modules", modules);`
`244`	`245`	`}`
`245`	`246`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public static IEnumerable<IntPtr> PyGCGetObjects()`
`152`	`152`	`for (long i = 0; i < length; i++)`
`153`	`153`	`{`
`154`	`154`	`var obj = PyList_GetItem(objs, i);`
`155`		`- yield return obj;`
	`155`	`+ yield return obj.DangerousGetAddress();`
`156`	`156`	`}`
`157`	`157`	`XDecref(objs);`
`158`	`158`	`XDecref(gc);`
`@@ -166,7 +166,7 @@ public static IEnumerable<IntPtr> GetModuleNames()`
`166`	`166`	`for (int i = 0; i < length; i++)`
`167`	`167`	`{`
`168`	`168`	`var name = PyList_GetItem(names, i);`
`169`		`- yield return name;`
	`169`	`+ yield return name.DangerousGetAddress();`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`