Merge pull request #5652 from RussKeldorph/5555

Fix WeakReference tests depending on JIT not extending lifetimes

2 files changed, 14 insertions, 2 deletions

diff --git a/tests/src/GC/API/WeakReference/IsAlive_neg.cs b/tests/src/GC/API/WeakReference/IsAlive_neg.cs
index c1b9ba8407..d229f59805 100644
--- a/tests/src/GC/API/WeakReference/IsAlive_neg.cs
+++ b/tests/src/GC/API/WeakReference/IsAlive_neg.cs
@@ -16,6 +16,12 @@ public class Test {
     public static void CreateArray() {
         array = new int[50];
     }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static WeakReference CreateArrayWeakReference()
+    {
+        return new WeakReference(array);
+    }
     
     [MethodImplAttribute(MethodImplOptions.NoInlining)]
     public static void DestroyArray() {
@@ -25,7 +31,7 @@ public class Test {
     public static int Main() {
         CreateArray();
 
-        WeakReference weak = new WeakReference(array); // array has ONLY a weakreference
+        WeakReference weak = CreateArrayWeakReference(); // array has ONLY a weakreference
 
         // ensuring that GC happens even with /debug mode
         DestroyArray();
diff --git a/tests/src/GC/API/WeakReference/Target.cs b/tests/src/GC/API/WeakReference/Target.cs
index 64d2a2bb36..91eb16168b 100644
--- a/tests/src/GC/API/WeakReference/Target.cs
+++ b/tests/src/GC/API/WeakReference/Target.cs
@@ -32,6 +32,12 @@ public class Test
     }
     
     [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static WeakReference CreateArrayWeakReference()
+    {
+        return new WeakReference(array);
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
     public static void DestroyArrays() 
     {
         array = null;
@@ -41,7 +47,7 @@ public class Test
     public bool GetTargetTest()
     {
         CreateArrays();
-        WeakReference weakarray = new WeakReference(array); // array has only weak reference
+        WeakReference weakarray = CreateArrayWeakReference(); // array has only weak reference
 
         // obj has both strong and weak ref and so should not get collected