From 61fa2fff3551e87010a200ac3b5ed2ad4549bc9a Mon Sep 17 00:00:00 2001
From: Katelyn Gadd <kg@luminance.org>
Date: Wed, 23 Jul 2025 14:09:15 -0700
Subject: [PATCH 1/2] Rework lifetime2 test so it uses noinlining'd methods as
 lifetime barriers since they are reliable Re enable lifetime2 for crossgen

---
 src/tests/JIT/Directed/lifetime/lifetime2.cs | 101 ++++++++++++-------
 src/tests/issues.targets                     |   3 -
 2 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/src/tests/JIT/Directed/lifetime/lifetime2.cs b/src/tests/JIT/Directed/lifetime/lifetime2.cs
index 1567dbd3210ddb..11e51c8f6c608e 100644
--- a/src/tests/JIT/Directed/lifetime/lifetime2.cs
+++ b/src/tests/JIT/Directed/lifetime/lifetime2.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using Xunit;
 
 public class Test_lifetime2
@@ -51,19 +52,27 @@ public void G()
     }
     private static int f1()
     {
-        B a = new B();
-        a.F();
-
-        Console.WriteLine();
-        Console.WriteLine("testcase f1-1");
-        if (aExists != 1)
+        [MethodImplAttribute(MethodImplOptions.NoInlining)]
+        static bool f1_1()
         {
-            Console.WriteLine("f1-1 failed");
-            return -1;
+            B a = new B();
+            a.F();
+
+            Console.WriteLine();
+            Console.WriteLine("testcase f1-1");
+            if (aExists != 1)
+            {
+                Console.WriteLine("f1-1 failed");
+                return false;
+            }
+
+            GC.KeepAlive(a);
+            return true;
         }
 
-        GC.KeepAlive(a);
-        a = null;
+        if (!f1_1())
+            return -1;
+
         GC.Collect();
         GC.WaitForPendingFinalizers();
 
@@ -75,19 +84,27 @@ private static int f1()
             return -1;
         }
 
-        C b = new C();
-        b.G();
-
-        Console.WriteLine();
-        Console.WriteLine("testcase f1-3");
-        if ((aExists != 1) || (bExists != 1))
+        [MethodImplAttribute(MethodImplOptions.NoInlining)]
+        static bool f1_3()
         {
-            Console.WriteLine("f1-3 failed");
-            return -1;
+            C b = new C();
+            b.G();
+
+            Console.WriteLine();
+            Console.WriteLine("testcase f1-3");
+            if ((aExists != 1) || (bExists != 1))
+            {
+                Console.WriteLine("f1-3 failed");
+                return false;
+            }
+
+            GC.KeepAlive(b);
+            return true;
         }
 
-        GC.KeepAlive(b);
-        b = null;
+        if (!f1_3())
+            return -1;
+
         GC.Collect();
         GC.WaitForPendingFinalizers();
 
@@ -102,26 +119,38 @@ private static int f1()
     }
     private static int f2()
     {
-        B a = new B();
+        [MethodImplAttribute(MethodImplOptions.NoInlining)]
+        static bool f2_2()
         {
-            C b = new C();
-            b.G();
-            b = null;
-        }
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
+            B a = new B();
 
-        a.F();
-        Console.WriteLine();
-        Console.WriteLine("testcase f2-1");
-        if ((aExists != 1) || (bExists != 0))
-        {
-            Console.WriteLine("f2-1 failed");
-            return -1;
+            [MethodImplAttribute(MethodImplOptions.NoInlining)]
+            static void f2_1()
+            {
+                C b = new C();
+                b.G();
+                b = null;
+            }
+            f2_1();
+
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+
+            a.F();
+            Console.WriteLine();
+            Console.WriteLine("testcase f2-1");
+            if ((aExists != 1) || (bExists != 0))
+            {
+                Console.WriteLine("f2-1 failed");
+                return false;
+            }
+
+            GC.KeepAlive(a);
+            return true;
         }
 
-        GC.KeepAlive(a);
-        a = null;
+        if (!f2_2())
+            return -1;
         GC.Collect();
         GC.WaitForPendingFinalizers();
         Console.WriteLine();
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index b9f4fcac8dd169..4bf65d077da26d 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -573,9 +573,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Arrays/misc/arrres_il_r/**">
             <Issue>https://github.com/dotnet/runtime/issues/109311</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/lifetime/lifetime2/**">
-            <Issue>https://github.com/dotnet/runtime/issues/109313</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/ObjectStackAllocation/ObjectStackAllocationTests/**">
             <Issue>https://github.com/dotnet/runtime/issues/109314</Issue>
         </ExcludeList>

From adc1029d17e9d6c37eba84b2b28e0f48b4bf4555 Mon Sep 17 00:00:00 2001
From: Katelyn Gadd <kg@luminance.org>
Date: Wed, 23 Jul 2025 17:18:20 -0700
Subject: [PATCH 2/2] Remove JIT/directed/lifetime/lifetime2 test because it is
 unreliable by construction

---
 src/tests/JIT/Directed/lifetime/lifetime2.cs  | 241 ------------------
 .../JIT/Directed/lifetime/lifetime2.csproj    |  18 --
 2 files changed, 259 deletions(-)
 delete mode 100644 src/tests/JIT/Directed/lifetime/lifetime2.cs
 delete mode 100644 src/tests/JIT/Directed/lifetime/lifetime2.csproj

diff --git a/src/tests/JIT/Directed/lifetime/lifetime2.cs b/src/tests/JIT/Directed/lifetime/lifetime2.cs
deleted file mode 100644
index 11e51c8f6c608e..00000000000000
--- a/src/tests/JIT/Directed/lifetime/lifetime2.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-//
-
-// Testing JIT handling and GC reporting of liveness of GC variable
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using Xunit;
-
-public class Test_lifetime2
-{
-    public static int aExists;
-    public static int bExists;
-    private abstract class A
-    {
-    }
-    private class B : A
-    {
-        public B()
-        {
-            aExists++;
-        }
-        ~B()
-        {
-            aExists--;
-            Console.WriteLine("~B");
-        }
-
-        public void F()
-        {
-            Console.WriteLine("B.F");
-        }
-    }
-    private class C : B
-    {
-        public C()
-        {
-            bExists++;
-        }
-        ~C()
-        {
-            bExists--;
-            Console.WriteLine("~C");
-        }
-
-        public void G()
-        {
-            Console.WriteLine("C.G");
-        }
-    }
-    private static int f1()
-    {
-        [MethodImplAttribute(MethodImplOptions.NoInlining)]
-        static bool f1_1()
-        {
-            B a = new B();
-            a.F();
-
-            Console.WriteLine();
-            Console.WriteLine("testcase f1-1");
-            if (aExists != 1)
-            {
-                Console.WriteLine("f1-1 failed");
-                return false;
-            }
-
-            GC.KeepAlive(a);
-            return true;
-        }
-
-        if (!f1_1())
-            return -1;
-
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
-
-        Console.WriteLine();
-        Console.WriteLine("testcase f1-2");
-        if (aExists != 0)
-        {
-            Console.WriteLine("f1-2 failed");
-            return -1;
-        }
-
-        [MethodImplAttribute(MethodImplOptions.NoInlining)]
-        static bool f1_3()
-        {
-            C b = new C();
-            b.G();
-
-            Console.WriteLine();
-            Console.WriteLine("testcase f1-3");
-            if ((aExists != 1) || (bExists != 1))
-            {
-                Console.WriteLine("f1-3 failed");
-                return false;
-            }
-
-            GC.KeepAlive(b);
-            return true;
-        }
-
-        if (!f1_3())
-            return -1;
-
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
-
-        Console.WriteLine();
-        Console.WriteLine("testcase f1-4");
-        if ((aExists != 0) || (bExists != 0))
-        {
-            Console.WriteLine("f1-4 failed");
-            return -1;
-        }
-        return 100;
-    }
-    private static int f2()
-    {
-        [MethodImplAttribute(MethodImplOptions.NoInlining)]
-        static bool f2_2()
-        {
-            B a = new B();
-
-            [MethodImplAttribute(MethodImplOptions.NoInlining)]
-            static void f2_1()
-            {
-                C b = new C();
-                b.G();
-                b = null;
-            }
-            f2_1();
-
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-
-            a.F();
-            Console.WriteLine();
-            Console.WriteLine("testcase f2-1");
-            if ((aExists != 1) || (bExists != 0))
-            {
-                Console.WriteLine("f2-1 failed");
-                return false;
-            }
-
-            GC.KeepAlive(a);
-            return true;
-        }
-
-        if (!f2_2())
-            return -1;
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
-        Console.WriteLine();
-        Console.WriteLine("testcase f2-2");
-        if (aExists != 0)
-        {
-            Console.WriteLine("f2-2 failed");
-            return -1;
-        }
-        return 100;
-    }
-    private static int f3()
-    {
-        C b = new C();
-        b = null;
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
-        Console.WriteLine();
-        Console.WriteLine("testcase f3");
-        if (aExists != 0)
-        {
-            Console.WriteLine("f3 failed");
-            return -1;
-        }
-        b = null;
-        return 100;
-    }
-    private static int f4()
-    {
-        B a = new B();
-        a.F();
-        C b = new C();
-        b.G();
-
-        Console.WriteLine();
-        Console.WriteLine("testcase f4");
-        if ((aExists != 2) || (bExists != 1))
-        {
-            Console.WriteLine("f4 failed");
-            return -1;
-        }
-
-        GC.KeepAlive(a);
-        GC.KeepAlive(b);
-        return 100;
-    }
-
-    private static int f5()
-    {
-        Console.WriteLine();
-        Console.WriteLine("testcase f5");
-        if ((aExists != 0) || (bExists != 0))
-        {
-            Console.WriteLine("f5 failed");
-            return -1;
-        }
-        return 100;
-    }
-
-    [Fact]
-    public static int TestEntryPoint()
-    {
-        if (f1() != 100)
-            return -1;
-        CleanGC();
-        if (f2() != 100)
-            return -1;
-        CleanGC();
-        if (f3() != 100)
-            return -1;
-        CleanGC();
-        if (f4() != 100)
-            return -1;
-        CleanGC();
-        if (f5() != 100)
-            return -1;
-        CleanGC();
-
-        Console.WriteLine("PASSED");
-        return 100;
-    }
-
-    private static void CleanGC()
-    {
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
-    }
-}
diff --git a/src/tests/JIT/Directed/lifetime/lifetime2.csproj b/src/tests/JIT/Directed/lifetime/lifetime2.csproj
deleted file mode 100644
index 0e79bac317c9b6..00000000000000
--- a/src/tests/JIT/Directed/lifetime/lifetime2.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <!-- Needed for JitOptimizationSensitive, GC.WaitForPendingFinalizers -->
-    <!-- See https://github.com/dotnet/runtime/issues/68529 -->
-    <RequiresProcessIsolation>true</RequiresProcessIsolation>
-
-    <CLRTestPriority>1</CLRTestPriority>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DebugType>None</DebugType>
-    <Optimize>True</Optimize>
-    <JitOptimizationSensitive>True</JitOptimizationSensitive>
-    <GCStressIncompatible>true</GCStressIncompatible>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="lifetime2.cs" />
-  </ItemGroup>
-</Project>