Skip to content

Unify JIT/Methodical/eh/common and JIT/jit64/eh/common #63597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trylek merged 1 commit into from
Jan 12, 2022
Merged

Unify JIT/Methodical/eh/common and JIT/jit64/eh/common #63597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions src/tests/JIT/Methodical/eh/basics/emptyfinally.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
.assembly extern common {}
.assembly extern eh_common {}
.assembly 'emptyfinally' {}
.assembly extern xunit.core {}

Expand All @@ -18,7 +18,7 @@
.class private auto ansi beforefieldinit Class1
extends [mscorlib]System.Object
{
.field private static class [common]TestUtil.TestLog testLog
.field private static class [eh_common]TestUtil.TestLog testLog
.method private hidebysig specialname rtspecialname static void .cctor() cil managed
{
.maxstack 2
Expand All @@ -32,8 +32,8 @@
ldstr "Done"
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
ldloc.s expectedOut
newobj instance void [common]TestUtil.TestLog::.ctor(object)
stsfld class [common]TestUtil.TestLog hello.Class1::testLog
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
stsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
ret
}

Expand All @@ -56,8 +56,8 @@
.entrypoint
.maxstack 1

ldsfld class [common]TestUtil.TestLog hello.Class1::testLog
callvirt instance void [common]TestUtil.TestLog::StartRecording()
ldsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()

.try
{
Expand All @@ -71,11 +71,11 @@
ldstr "Done"
call void [System.Console]System.Console::WriteLine(string)

ldsfld class [common]TestUtil.TestLog hello.Class1::testLog
callvirt instance void [common]TestUtil.TestLog::StopRecording()
ldsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()

ldsfld class [common]TestUtil.TestLog hello.Class1::testLog
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
ldsfld class [eh_common]TestUtil.TestLog hello.Class1::testLog
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()

ret
}
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="emptyfinally.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="emptyfinally.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/multihandler_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="multihandler.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/multihandler_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="multihandler.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/multihandler_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="multihandler.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/multihandler_ro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="multihandler.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwincatch_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<Compile Include="throwincatch.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwincatch_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<Compile Include="throwincatch.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwincatch_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<Compile Include="throwincatch.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwincatch_ro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<Compile Include="throwincatch.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinclassconstructor.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinclassconstructor.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinclassconstructor.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinclassconstructor.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions src/tests/JIT/Methodical/eh/basics/throwinexcept.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
.assembly extern common {}
.assembly extern eh_common {}
.assembly test {}
.module test.exe

Expand All @@ -18,7 +18,7 @@
.maxstack 2
.locals init (
class [mscorlib]System.IO.StringWriter expectedOut,
class [common]TestUtil.TestLog testLog
class [eh_common]TestUtil.TestLog testLog
)

newobj instance void [mscorlib]System.IO.StringWriter::.ctor()
Expand All @@ -39,11 +39,11 @@
ldstr "Done"
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
ldloc.s expectedOut
newobj instance void [common]TestUtil.TestLog::.ctor(object)
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
stloc.s testLog

ldloc.s testLog
callvirt instance void [common]TestUtil.TestLog::StartRecording()
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()

.try {
try_start:
Expand Down Expand Up @@ -78,10 +78,10 @@ done2:
call void [System.Console]System.Console::WriteLine(string)

ldloc.s testLog
callvirt instance void [common]TestUtil.TestLog::StopRecording()
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()

ldloc.s testLog
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()

ret
}
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="throwinexcept.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<Compile Include="throwinexcept.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions src/tests/JIT/Methodical/eh/basics/throwinfault.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
.assembly extern common {}
.assembly extern eh_common {}
.assembly test {}
.module test.exe

Expand All @@ -18,7 +18,7 @@
.maxstack 2
.locals init (
class [mscorlib]System.IO.StringWriter expectedOut,
class [common]TestUtil.TestLog testLog
class [eh_common]TestUtil.TestLog testLog
)

newobj instance void [mscorlib]System.IO.StringWriter::.ctor()
Expand All @@ -36,11 +36,11 @@
ldstr "In catch"
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
ldloc.s expectedOut
newobj instance void [common]TestUtil.TestLog::.ctor(object)
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
stloc.s testLog

ldloc.s testLog
callvirt instance void [common]TestUtil.TestLog::StartRecording()
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()

.try {
ldstr "In try - catch"
Expand Down Expand Up @@ -72,10 +72,10 @@
done:

ldloc.s testLog
callvirt instance void [common]TestUtil.TestLog::StopRecording()
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()

ldloc.s testLog
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()

ret
}
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="throwinfault.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<Compile Include="throwinfault.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions src/tests/JIT/Methodical/eh/basics/throwinfilter.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
.assembly extern common {}
.assembly extern eh_common {}
.assembly test {}
.module test.exe

Expand All @@ -18,7 +18,7 @@
.maxstack 2
.locals init (
class [mscorlib]System.IO.StringWriter expectedOut,
class [common]TestUtil.TestLog testLog
class [eh_common]TestUtil.TestLog testLog
)

newobj instance void [mscorlib]System.IO.StringWriter::.ctor()
Expand All @@ -36,11 +36,11 @@
ldstr "Done"
callvirt instance void [mscorlib]System.IO.TextWriter::WriteLine(string)
ldloc.s expectedOut
newobj instance void [common]TestUtil.TestLog::.ctor(object)
newobj instance void [eh_common]TestUtil.TestLog::.ctor(object)
stloc.s testLog

ldloc.s testLog
callvirt instance void [common]TestUtil.TestLog::StartRecording()
callvirt instance void [eh_common]TestUtil.TestLog::StartRecording()

.try {
try_start:
Expand Down Expand Up @@ -75,10 +75,10 @@ done2:
call void [System.Console]System.Console::WriteLine(string)

ldloc.s testLog
callvirt instance void [common]TestUtil.TestLog::StopRecording()
callvirt instance void [eh_common]TestUtil.TestLog::StopRecording()

ldloc.s testLog
callvirt instance int32 [common]TestUtil.TestLog::VerifyOutput()
callvirt instance int32 [eh_common]TestUtil.TestLog::VerifyOutput()

ret
}
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<Compile Include="throwinfilter.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<Compile Include="throwinfilter.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfinally_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinfinally.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfinally_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinfinally.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfinally_r.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinfinally.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<Compile Include="throwinfinally.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<Compile Include="throwinfinallyerrpath.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<Compile Include="throwinfinallyerrpath.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\common\common.csproj" />
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
</ItemGroup>
</Project>
Loading