fixed CollectBasicObject by ensuring MakeAGarbage is not keeping temp object alive

lostmsu · lostmsu · commit 002d730523cb · 2020-12-10T13:59:10.000-08:00
diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
@@ -2,9 +2,9 @@
 using Python.Runtime;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading;
 
 namespace Python.EmbeddingTest
@@ -47,7 +47,6 @@ private static bool FullGCCollect()
         }
 
         [Test]
-        [Ignore("Ignore temporarily")]
         public void CollectBasicObject()
         {
             Assert.IsTrue(Finalizer.Instance.Enable);
@@ -104,7 +103,6 @@ public void CollectBasicObject()
         }
 
         [Test]
-        [Ignore("Ignore temporarily")]
         public void CollectOnShutdown()
         {
             IntPtr op = MakeAGarbage(out var shortWeak, out var longWeak);
@@ -125,6 +123,7 @@ public void CollectOnShutdown()
             Assert.IsEmpty(garbage);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)] // ensure lack of references to obj
         private static IntPtr MakeAGarbage(out WeakReference shortWeak, out WeakReference longWeak)
         {
             PyLong obj = new PyLong(1024);

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`using Python.Runtime;`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`		`-using System.ComponentModel;`
`6`	`5`	`using System.Diagnostics;`
`7`	`6`	`using System.Linq;`
	`7`	`+using System.Runtime.CompilerServices;`
`8`	`8`	`using System.Threading;`
`9`	`9`
`10`	`10`	`namespace Python.EmbeddingTest`
`@@ -47,7 +47,6 @@ private static bool FullGCCollect()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`[Test]`
`50`		`- [Ignore("Ignore temporarily")]`
`51`	`50`	`public void CollectBasicObject()`
`52`	`51`	`{`
`53`	`52`	`Assert.IsTrue(Finalizer.Instance.Enable);`
`@@ -104,7 +103,6 @@ public void CollectBasicObject()`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`[Test]`
`107`		`- [Ignore("Ignore temporarily")]`
`108`	`106`	`public void CollectOnShutdown()`
`109`	`107`	`{`
`110`	`108`	`IntPtr op = MakeAGarbage(out var shortWeak, out var longWeak);`
`@@ -125,6 +123,7 @@ public void CollectOnShutdown()`
`125`	`123`	`Assert.IsEmpty(garbage);`
`126`	`124`	`}`
`127`	`125`
	`126`	`+ [MethodImpl(MethodImplOptions.NoInlining)] // ensure lack of references to obj`
`128`	`127`	`private static IntPtr MakeAGarbage(out WeakReference shortWeak, out WeakReference longWeak)`
`129`	`128`	`{`
`130`	`129`	`PyLong obj = new PyLong(1024);`