From 564dbfdbbbcfaff7bdb9dc36c09a6959405f3967 Mon Sep 17 00:00:00 2001
From: Will Smith <lol.tihan@gmail.com>
Date: Wed, 13 Jul 2022 13:53:59 -0700
Subject: [PATCH 1/4] Added DEBUG switches for roundtrip ILASM

---
 src/tests/Common/CLRTest.Jit.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tests/Common/CLRTest.Jit.targets b/src/tests/Common/CLRTest.Jit.targets
index 6d8d625de72a7d..05bccf6eac08fe 100644
--- a/src/tests/Common/CLRTest.Jit.targets
+++ b/src/tests/Common/CLRTest.Jit.targets
@@ -35,6 +35,10 @@ WARNING:   When setting properties based on their current state (for example:
       <DisassemblyName>$(AssemblyName).dasm.il</DisassemblyName>
       <TargetAssemblyName>$(AssemblyName).asm.dll</TargetAssemblyName>
 
+      <_IlasmSwitches Condition="'$(DebugType)' == 'Full'">$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) -DEBUG=IMPL</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
+
       <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'RunOnly'"><![CDATA[
 # IlasmRoundTrip Script
 # For CLRTestKind==RunOnly, we don't do any ilasm round-trip testing. We also need to disable

From cd0f7f19a09f341fc4da50256aa73d3f205bacc8 Mon Sep 17 00:00:00 2001
From: Will Smith <lol.tihan@gmail.com>
Date: Mon, 25 Jul 2022 15:43:11 -0700
Subject: [PATCH 2/4] Adding debug switch in the test

---
 src/tests/Common/CLRTest.Jit.targets                     | 4 ----
 src/tests/JIT/Directed/debugging/poisoning/poison.csproj | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/tests/Common/CLRTest.Jit.targets b/src/tests/Common/CLRTest.Jit.targets
index c4af3bdc5452f7..67b372abfa2010 100644
--- a/src/tests/Common/CLRTest.Jit.targets
+++ b/src/tests/Common/CLRTest.Jit.targets
@@ -35,10 +35,6 @@ WARNING:   When setting properties based on their current state (for example:
       <DisassemblyName>$(AssemblyName).dasm.il</DisassemblyName>
       <TargetAssemblyName>$(AssemblyName).asm.dll</TargetAssemblyName>
 
-      <_IlasmSwitches Condition="'$(DebugType)' == 'Full'">$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) -DEBUG=IMPL</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
-
       <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'RunOnly'"><![CDATA[
 # IlasmRoundTrip Script
 # For CLRTestKind==RunOnly, we don't do any ilasm round-trip testing. We also need to disable
diff --git a/src/tests/JIT/Directed/debugging/poisoning/poison.csproj b/src/tests/JIT/Directed/debugging/poisoning/poison.csproj
index b2691ab4cab22b..67755c4e9c3b0b 100644
--- a/src/tests/JIT/Directed/debugging/poisoning/poison.csproj
+++ b/src/tests/JIT/Directed/debugging/poisoning/poison.csproj
@@ -4,6 +4,7 @@
     <DebugType>PdbOnly</DebugType>
     <Optimize>False</Optimize>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <_IlasmSwitches>$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />

From ae13112a4b2971d7d110843f506136888b6cd0b7 Mon Sep 17 00:00:00 2001
From: Will Smith <lol.tihan@gmail.com>
Date: Fri, 5 Aug 2022 12:05:19 -0700
Subject: [PATCH 3/4] Updated with Bruce's variant

---
 src/tests/Common/CLRTest.Jit.targets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/tests/Common/CLRTest.Jit.targets b/src/tests/Common/CLRTest.Jit.targets
index 67b372abfa2010..aac7856029be50 100644
--- a/src/tests/Common/CLRTest.Jit.targets
+++ b/src/tests/Common/CLRTest.Jit.targets
@@ -29,6 +29,12 @@ WARNING:   When setting properties based on their current state (for example:
   ***********************************************************************************************
   -->
 
+  <PropertyGroup>
+    <_IlasmSwitches Condition="'$(DebugType)' == 'Full'">$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
+    <_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) -DEBUG=IMPL</_IlasmSwitches>
+    <_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
+  </PropertyGroup>
+
   <Target Name="GetIlasmRoundTripBashScript"
           Returns="$(IlasmRoundTripBashScript);$(BashIlrtTestLaunchCmds)">
     <PropertyGroup>

From f8d74f76585426b7d57b7f9acdc8ceb71d7f84bd Mon Sep 17 00:00:00 2001
From: Will Smith <lol.tihan@gmail.com>
Date: Fri, 5 Aug 2022 12:05:47 -0700
Subject: [PATCH 4/4] Update poison.csproj

---
 src/tests/JIT/Directed/debugging/poisoning/poison.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tests/JIT/Directed/debugging/poisoning/poison.csproj b/src/tests/JIT/Directed/debugging/poisoning/poison.csproj
index 67755c4e9c3b0b..b2691ab4cab22b 100644
--- a/src/tests/JIT/Directed/debugging/poisoning/poison.csproj
+++ b/src/tests/JIT/Directed/debugging/poisoning/poison.csproj
@@ -4,7 +4,6 @@
     <DebugType>PdbOnly</DebugType>
     <Optimize>False</Optimize>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <_IlasmSwitches>$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />