From 77f4d7a3f28b4c5e225dff1e7f90173a322fb48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Sat, 29 Jan 2022 08:52:13 +0100 Subject: [PATCH] Remove command-line arguments from Main methods in ILPROj projects (#64482) In my recent change I fixed C# test projects to stop using command-line arguments. This follow-up change complements it by applying the same transformation to IL projects. In most cases the arguments were ignored so the transformation was trivial; in the special case of twoEndFinallys.il the argument array is passed to the method TwoEndFinallys so I patched it to allocate a zero-sized string array instead (there are no tests passing actual command-line arguments to the test app). Thanks Tomas --- src/tests/JIT/Methodical/eh/basics/emptyfinally.il | 2 +- .../JIT/Methodical/eh/basics/tryfinallywith2endfinally.il | 2 +- .../eh/basics/tryfinallywith2reachableendfinally.il | 2 +- src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il | 2 +- .../JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il | 2 +- .../JIT/Methodical/eh/finallyexec/catchrettoinnertry.il | 2 +- .../Methodical/eh/finallyexec/nonlocalexittonestedsibling.il | 2 +- src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il | 2 +- src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il | 2 +- .../JIT/Methodical/eh/leaves/branchbackwardswithcatch.il | 2 +- .../JIT/Methodical/eh/leaves/branchbackwardswithfinally.il | 2 +- .../JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il | 2 +- src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il | 2 +- src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il | 2 +- src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il | 2 +- src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il | 2 +- .../eh/leaves/tryfinallyintrycatchwithleaveintotry.il | 2 +- src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il | 2 +- .../JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il | 2 +- .../JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il | 2 +- .../JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il | 5 +++-- .../JIT/Methodical/inlining/dev10_bug719093/variancesmall.il | 2 +- src/tests/JIT/Methodical/nonvirtualcall/classic.il | 2 +- src/tests/JIT/Methodical/nonvirtualcall/delegate.il | 2 +- src/tests/JIT/Methodical/nonvirtualcall/generics.il | 2 +- src/tests/JIT/Methodical/nonvirtualcall/generics2.il | 2 +- src/tests/JIT/Methodical/nonvirtualcall/tailcall.il | 2 +- src/tests/JIT/Methodical/nonvirtualcall/valuetype.il | 2 +- 28 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il index 0ad150dd5b1981..4e2f8081fa6b0f 100644 --- a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il +++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il @@ -48,7 +48,7 @@ .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il index 10f663b48244fd..d1131b696ded08 100644 --- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il +++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il @@ -38,7 +38,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il index f92dc8acf5cbed..99322c0371165b 100644 --- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il +++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il @@ -44,7 +44,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il index d0fad14bb4304a..38bb6144f35b9d 100644 --- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il +++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il @@ -113,7 +113,7 @@ } // end of method Class1::inFinally .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il index a16deba23f93df..f2c24d3916e13c 100644 --- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il +++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il @@ -66,7 +66,7 @@ extends [mscorlib]System.Object { .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il index 045eb725be5491..876d61b6d7cac5 100644 --- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il +++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il @@ -66,7 +66,7 @@ ret } .method private hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il index c3fd5fd1534940..16b22c14b97f87 100644 --- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il +++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il @@ -56,7 +56,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il index fe173773ddcb50..25cd53f9527563 100644 --- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il +++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il @@ -38,7 +38,7 @@ extends [mscorlib]System.Object { .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il index 7622150ab520d9..0083d08b13c3d2 100644 --- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il +++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il @@ -75,7 +75,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il index 59dc610160c67f..05affd9b7f7965 100644 --- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il +++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il @@ -74,7 +74,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il index f1c07aba492b03..127425504c0a7b 100644 --- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il +++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il @@ -74,7 +74,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il index b17ba775076758..de2ec0385b8cdd 100644 --- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il +++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il @@ -83,7 +83,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il index 34a79462a7c044..e0c653e4f56164 100644 --- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il +++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il @@ -39,7 +39,7 @@ extends [mscorlib]System.Object { .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il index 831f8227f79d91..d500275f8d4b90 100644 --- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il +++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il @@ -74,7 +74,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il index 677873d6cc29c7..c6b6aa006c745a 100644 --- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il +++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il @@ -63,7 +63,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il index 56f4feee5d43c2..8ccab02bdd3b0f 100644 --- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il +++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il @@ -55,7 +55,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il index 8ee803a7a8f21f..6dc5ca240c8c17 100644 --- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il +++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il @@ -56,7 +56,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il index 29dd18a3733828..30b494ed6ae547 100644 --- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il +++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il @@ -54,7 +54,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il index 4f64c5669c2ac4..cef244dd43f09c 100644 --- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il +++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il @@ -54,7 +54,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il index cbc8f49a802c32..ea985dc848fe70 100644 --- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il +++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il @@ -54,7 +54,7 @@ } .method public hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il index df5dc52f71d07a..1d34d53210cc74 100644 --- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il +++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il @@ -50,7 +50,7 @@ } // end of method Test::.ctor .method private hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 @@ -59,7 +59,8 @@ // Code size 23 (0x17) .maxstack 2 .locals init (class Test_twoEndFinallys V_0) - IL_0000: ldarg.0 + ldc.i4.s 0 + IL_0000: newarr [mscorlib]System.String IL_0001: call class Test_twoEndFinallys Test_twoEndFinallys::TwoEndFinallys(string[]) IL_0006: stloc.0 IL_0007: ldloc.0 diff --git a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il index 65bea4b23998b7..6b2bb0bade8224 100644 --- a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il +++ b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il @@ -290,7 +290,7 @@ } .method private hidebysig static int32 - Main(string[] args) cil managed + Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic.il b/src/tests/JIT/Methodical/nonvirtualcall/classic.il index 58ad342c484d44..6eaeded7ecc146 100644 --- a/src/tests/JIT/Methodical/nonvirtualcall/classic.il +++ b/src/tests/JIT/Methodical/nonvirtualcall/classic.il @@ -681,7 +681,7 @@ IL_000e: ret } // end of method Program::CallFromInsideGrandChild - .method public hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate.il b/src/tests/JIT/Methodical/nonvirtualcall/delegate.il index 91b24d2723fad5..00a20015f576c6 100644 --- a/src/tests/JIT/Methodical/nonvirtualcall/delegate.il +++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate.il @@ -566,7 +566,7 @@ IL_007f: ret } // end of method Program::CallDelegateFromGrandChild - .method public hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics.il b/src/tests/JIT/Methodical/nonvirtualcall/generics.il index 1a23c734a0e143..9bbb9f408d822c 100644 --- a/src/tests/JIT/Methodical/nonvirtualcall/generics.il +++ b/src/tests/JIT/Methodical/nonvirtualcall/generics.il @@ -693,7 +693,7 @@ IL_000e: ret } // end of method Program::CallFromInsideGrandChild - .method public hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2.il b/src/tests/JIT/Methodical/nonvirtualcall/generics2.il index 59635af68e3bda..c75da589bb866f 100644 --- a/src/tests/JIT/Methodical/nonvirtualcall/generics2.il +++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2.il @@ -728,7 +728,7 @@ IL_000e: ret } // end of method Program::CallFromInsideGrandChild - .method public hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il index 9bbb008aa5de52..959f4fb2a3c504 100644 --- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il +++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il @@ -601,7 +601,7 @@ IL_000e: ret } // end of method Program::CallFromInsideGrandChild - .method public hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il index 25897d22e79400..44bc21e2a79750 100644 --- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il +++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il @@ -114,7 +114,7 @@ IL_0037: ret } // end of method Program::CallDummy - .method public hidebysig static int32 Main(string[] args) cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00