From c2eb64d20507ceaff2ddebfaa6cb50fa460ecede Mon Sep 17 00:00:00 2001
From: Tomas Rylek <trylek@microsoft.com>
Date: Sat, 30 Sep 2023 23:20:14 +0200
Subject: [PATCH] Fix LLVAM AOT crash when compiling the genmeth.dll assembly

---
 src/tests/Directory.Build.targets                            | 2 +-
 .../classloader/regressions/dev10_403582/genmeth.ilproj      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 11c86348e22c25..cefb5e341a494c 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -35,7 +35,7 @@
   <!-- Default priority building values. -->
   <PropertyGroup>
     <DisableProjectBuild Condition="'$(IsMergedTestRunnerAssembly)' == 'true' and $(BuildAsStandalone)">true</DisableProjectBuild>
-    <OutputType Condition="('$(IsMergedTestRunnerAssembly)' == 'true' and !$(BuildAsStandalone)) or '$(RequiresProcessIsolation)' == 'true'">Exe</OutputType>
+    <OutputType Condition="('$(IsMergedTestRunnerAssembly)' == 'true' and !$(BuildAsStandalone)) or ('$(RequiresProcessIsolation)' == 'true' and '$(CLRTestKind)' != 'SharedLibrary')">Exe</OutputType>
 
     <CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Exe'">BuildAndRun</CLRTestKind>
     <CLRTestKind Condition="'$(CLRTestKind)' == ''">SharedLibrary</CLRTestKind>
diff --git a/src/tests/Loader/classloader/regressions/dev10_403582/genmeth.ilproj b/src/tests/Loader/classloader/regressions/dev10_403582/genmeth.ilproj
index eeb4fbd534a7ce..b567c94322dcef 100644
--- a/src/tests/Loader/classloader/regressions/dev10_403582/genmeth.ilproj
+++ b/src/tests/Loader/classloader/regressions/dev10_403582/genmeth.ilproj
@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
+    <!-- Without process isolation, this support assembly gets copied to the merged wrapper folder -->
+    <!-- where it subsequently crashes the LLVM AOT compiler. -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <OutputType>Library</OutputType>
-    <CLRTestKind>BuildOnly</CLRTestKind>
+    <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="genmeth.il" />