diff options
| author | Adeel Mujahid <3840695+am11@users.noreply.github.com> | 2022-07-17 08:11:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 08:11:11 +0300 |
| commit | 3ea30ed321949d238bf97534a2a8cbabf580f238 (patch) | |
| tree | 4e80b5512b1b1337629af441aa6a21fceceaf2b9 /src/tests/Loader | |
| parent | 8a709bca625d079bb97ee7a9c524217bbc6c3278 (diff) | |
Fix typos (#72314)
* Fix typos
* Cleanup trailing whitespaces in committed files
* Revert a macro for win32 compat
* Disambiguate test data method
* Revert XMLPath test which rely on external assets
* Revert whitespace change in Xml tests
* Revert ClrEtwAl and ILLink.Shared
* Revert crossgen2 props/targets and *.wxl
Diffstat (limited to 'src/tests/Loader')
17 files changed, 780 insertions, 780 deletions
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.il index eb263f608b6..9e8d491888f 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.il @@ -67,14 +67,14 @@ } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc(string& res) + .method public hidebysig newslot virtual instance object MyFunc(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -82,7 +82,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IB MyFunc(string& res) + .method public hidebysig newslot virtual instance class IB MyFunc(string& res) { ldarg.1 ldstr "IB GenBaseType.MyFunc()" @@ -106,7 +106,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IB GenToNonGen(string& res) + .method public hidebysig newslot virtual instance class IB GenToNonGen(string& res) { ldarg.1 ldstr "IB GenBaseType.GenToNonGen()" @@ -114,7 +114,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IB NonGenThroughGenFunc(string& res) + .method public hidebysig newslot virtual instance class IB NonGenThroughGenFunc(string& res) { ldarg.1 ldstr "IB GenBaseType.NonGenThroughGenFunc()" @@ -122,7 +122,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IGenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class IGenRetType<int32,object> MyGenFunc(string& res) { ldarg.1 ldstr "IGenRetType<int32,object> GenBaseType.MyGenFunc()" @@ -130,7 +130,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IGenRetType<!A, class IDictionary<string,!B>> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class IGenRetType<!A, class IDictionary<string,!B>> MyGenFunc(string& res) { ldarg.1 ldstr "IGenRetType<!A, class IDictionary<string,!B>> GenBaseType.MyGenFunc()" @@ -150,7 +150,7 @@ } // ======================================================================================== -// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -205,7 +205,7 @@ // ======================================================================================== -// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with +// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with // covariant return types (more derived return types than the ones used in GenMiddleType) // ======================================================================================== @@ -252,7 +252,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class IGenRetType<!U,!V> MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -263,7 +263,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class IC MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -327,14 +327,14 @@ newobj instance void [System.Runtime]System.Exception::.ctor(string) throw } - + .method public hidebysig virtual instance object MyFunc(string& res) { ldstr "Should never execute this method" newobj instance void [System.Runtime]System.Exception::.ctor(string) throw } - + .method public hidebysig virtual instance class IB MyFunc(string& res) { ldstr "Should never execute this method" @@ -358,7 +358,7 @@ } // ======================================================================================== -// FOURTH LAYER type: overrides all virtuals from GenBaseType using MethodImpls with +// FOURTH LAYER type: overrides all virtuals from GenBaseType using MethodImpls with // covariant return types (classes that implement the interfaces used as return types) // ======================================================================================== @@ -405,7 +405,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenRetType<!U,!V> MyFunc(string& res) { .override method instance object class GenBaseType<!U,!V>::MyFunc(string& res) @@ -415,7 +415,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C MyFunc(string& res) { .override method instance class IB class GenBaseType<!U,!V>::MyFunc(string& res) @@ -496,7 +496,7 @@ string a, [opt] string b, [opt] string c, - [opt] string d) cil managed + [opt] string d) cil managed { .param [3] = nullref .param [4] = nullref @@ -588,14 +588,14 @@ // ============== Test using GenTestType ============== // // These test methods will callvirt each method using: // 1) The signature from GetBaseType - // 2) The signature from GenMiddleType with covariant returns (when applicable) + // 2) The signature from GenMiddleType with covariant returns (when applicable) // 3) The signature from GenTestType with covariant returns // And verify that the override on GetTestType is the one that executes - - .method public static bool RunTest1() noinlining + + .method public static bool RunTest1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -615,10 +615,10 @@ ret } - .method public static bool RunTest2() noinlining + .method public static bool RunTest2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::MyFunc(string&) @@ -637,11 +637,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest3() noinlining + + .method public static bool RunTest3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class IGenRetType<!0, class IDictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -666,10 +666,10 @@ ret } - .method public static bool RunTest4() noinlining + .method public static bool RunTest4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class IGenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -694,10 +694,10 @@ ret } - .method public static bool RunTest5() noinlining + .method public static bool RunTest5() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::GenToNonGen(string&) @@ -722,10 +722,10 @@ ret } - .method public static bool RunTest6() noinlining + .method public static bool RunTest6() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -820,12 +820,12 @@ // These test methods will callvirt each method using: // 1) The signature from GetBaseType // 2) The signature from GenMiddleType with covariant returns - // And verify that the override on GenMiddleType is the one that executes - - .method public static bool RunTest_Middle1() noinlining + // And verify that the override on GenMiddleType is the one that executes + + .method public static bool RunTest_Middle1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class IGenRetType<!0, class IDictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -845,10 +845,10 @@ ret } - .method public static bool RunTest_Middle2() noinlining + .method public static bool RunTest_Middle2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class IGenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -868,10 +868,10 @@ ret } - .method public static bool RunTest_Middle3() noinlining + .method public static bool RunTest_Middle3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::GenToNonGen(string&) @@ -891,10 +891,10 @@ ret } - .method public static bool RunTest_Middle4() noinlining + .method public static bool RunTest_Middle4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -913,19 +913,19 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - + // ============== Test using GenMoreDerived ============== // // These test methods will callvirt each method using: // 1) The signature from GetBaseType - // 2) The signature from GenMiddleType with covariant returns (when applicable) + // 2) The signature from GenMiddleType with covariant returns (when applicable) // 3) The signature from GenTestType with covariant returns - // 4) The signature from GenMoreDerived with covariant returns + // 4) The signature from GenMoreDerived with covariant returns // And verify that the override on GenMoreDerived is the one that executes - - .method public static bool RunTest_MoreDerived1() noinlining + + .method public static bool RunTest_MoreDerived1() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class GenMoreDerived<object,int32,int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -950,10 +950,10 @@ ret } - .method public static bool RunTest_MoreDerived2() noinlining + .method public static bool RunTest_MoreDerived2() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class GenMoreDerived<object,int32,int32,object>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::MyFunc(string&) @@ -977,11 +977,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest_MoreDerived3() noinlining + + .method public static bool RunTest_MoreDerived3() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class GenMoreDerived<object,int32,int32,object>::.ctor() ldloca.s 0 callvirt instance class IGenRetType<!0, class IDictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1011,10 +1011,10 @@ ret } - .method public static bool RunTest_MoreDerived4() noinlining + .method public static bool RunTest_MoreDerived4() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class GenMoreDerived<object,int32,int32,object>::.ctor() ldloca.s 0 callvirt instance class IGenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1044,10 +1044,10 @@ ret } - .method public static bool RunTest_MoreDerived5() noinlining + .method public static bool RunTest_MoreDerived5() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class GenMoreDerived<object,int32,int32,object>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::GenToNonGen(string&) @@ -1077,10 +1077,10 @@ ret } - .method public static bool RunTest_MoreDerived6() noinlining + .method public static bool RunTest_MoreDerived6() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class GenMoreDerived<object,int32,int32,object>::.ctor() ldloca.s 0 callvirt instance class IB class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -1113,14 +1113,14 @@ // ===================================================================================== // - .method public static void RunTest_Invalid1() noinlining + .method public static void RunTest_Invalid1() noinlining { newobj instance void class Invalid1<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest_Invalid2() noinlining + .method public static void RunTest_Invalid2() noinlining { newobj instance void class Invalid2<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) @@ -1144,40 +1144,40 @@ .entrypoint .maxstack 2 .locals init ( bool result ) - + ldc.i4.1 stloc.0 - + T1: call bool CMain::RunTest1() brtrue.s T2 ldc.i4.0 stloc.0 - + T2: call bool CMain::RunTest2() brtrue.s T3 ldc.i4.0 stloc.0 - + T3: call bool CMain::RunTest3() brtrue.s T4 ldc.i4.0 stloc.0 - + T4: call bool CMain::RunTest4() brtrue.s T5 ldc.i4.0 stloc.0 - + T5: call bool CMain::RunTest5() brtrue.s T6 ldc.i4.0 stloc.0 - + T6: call bool CMain::RunTest6() brtrue.s T7 @@ -1203,31 +1203,31 @@ stloc.0 // ===================================================================================== // - + M1: call bool CMain::RunTest_Middle1() brtrue.s M2 ldc.i4.0 stloc.0 - + M2: call bool CMain::RunTest_Middle2() brtrue.s M3 ldc.i4.0 stloc.0 - + M3: call bool CMain::RunTest_Middle3() brtrue.s M4 ldc.i4.0 stloc.0 - + M4: call bool CMain::RunTest_Middle4() brtrue.s MOREDERIVED1 ldc.i4.0 stloc.0 - + // ===================================================================================== // MOREDERIVED1: @@ -1235,37 +1235,37 @@ brtrue.s MOREDERIVED2 ldc.i4.0 stloc.0 - + MOREDERIVED2: call bool CMain::RunTest_MoreDerived2() brtrue.s MOREDERIVED3 ldc.i4.0 stloc.0 - + MOREDERIVED3: call bool CMain::RunTest_MoreDerived3() brtrue.s MOREDERIVED4 ldc.i4.0 stloc.0 - + MOREDERIVED4: call bool CMain::RunTest_MoreDerived4() brtrue.s MOREDERIVED5 ldc.i4.0 stloc.0 - + MOREDERIVED5: call bool CMain::RunTest_MoreDerived5() brtrue.s MOREDERIVED6 ldc.i4.0 stloc.0 - + MOREDERIVED6: call bool CMain::RunTest_MoreDerived6() brtrue.s INVALID1 ldc.i4.0 - stloc.0 - + stloc.0 + // ===================================================================================== // INVALID1: @@ -1279,13 +1279,13 @@ leave.s INVALID2 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s INVALID2 } - + INVALID2: .try { @@ -1297,10 +1297,10 @@ leave.s INVALID3 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s INVALID3 } @@ -1332,7 +1332,7 @@ call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.il index 2d8ed43645a..49d22348ca8 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.il @@ -76,14 +76,14 @@ } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc(string& res) + .method public hidebysig newslot virtual instance object MyFunc(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -91,7 +91,7 @@ newobj instance void A::.ctor() ret } - .method public hidebysig newslot virtual instance class B MyFunc(string& res) + .method public hidebysig newslot virtual instance class B MyFunc(string& res) { ldarg.1 ldstr "B GenBaseType.MyFunc()" @@ -99,7 +99,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) + .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) { ldarg.1 ldstr "B GenBaseType.GenToNonGen()" @@ -107,7 +107,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) + .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) { ldarg.1 ldstr "B GenBaseType.NonGenThroughGenFunc()" @@ -115,7 +115,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<int32,object> GenBaseType.MyGenFunc()" @@ -123,7 +123,7 @@ newobj instance void class GenRetType<int32,object>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<!A, class Dictionary<string,!B>> GenBaseType.MyGenFunc()" @@ -134,7 +134,7 @@ } // ======================================================================================== -// SECOND LAYER type: overrides all virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides all virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -179,7 +179,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenRetType<!U,!V> NewFunc1(string& res) { .override method instance object class GenBaseType<!U,!V>::MyFunc(string& res) @@ -189,7 +189,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C NewFunc2(string& res) { .override method instance class B class GenBaseType<!U,!V>::MyFunc(string& res) @@ -211,7 +211,7 @@ .class public auto ansi beforefieldinit Invalid1<U,V> extends class GenTestType<!U,!V> { - .method public hidebysig virtual instance object MyFunc(string& res) + .method public hidebysig virtual instance object MyFunc(string& res) { ldnull ret @@ -220,7 +220,7 @@ } .class public auto ansi beforefieldinit Invalid2<U,V> extends class GenTestType<!U,!V> { - .method public hidebysig virtual instance class B MyFunc(string& res) + .method public hidebysig virtual instance class B MyFunc(string& res) { ldnull ret @@ -229,7 +229,7 @@ } .class public auto ansi beforefieldinit Invalid3<U,V> extends class GenTestType<!U,!V> { - .method public hidebysig virtual instance class B GenToNonGen(string& res) + .method public hidebysig virtual instance class B GenToNonGen(string& res) { ldnull ret @@ -238,7 +238,7 @@ } .class public auto ansi beforefieldinit Invalid4<U,V> extends class GenTestType<!U,!V> { - .method public hidebysig virtual instance class B NonGenThroughGenFunc(string& res) + .method public hidebysig virtual instance class B NonGenThroughGenFunc(string& res) { ldnull ret @@ -247,7 +247,7 @@ } .class public auto ansi beforefieldinit Invalid5<U,V> extends class GenTestType<!U,!V> { - .method public hidebysig virtual instance class GenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig virtual instance class GenRetType<int32,object> MyGenFunc(string& res) { ldnull ret @@ -256,7 +256,7 @@ } .class public auto ansi beforefieldinit Invalid6<U,V> extends class GenTestType<!U,!V> { - .method public hidebysig virtual instance class GenRetType<!U, class Dictionary<string,!V>> MyGenFunc(string& res) + .method public hidebysig virtual instance class GenRetType<!U, class Dictionary<string,!V>> MyGenFunc(string& res) { ldnull ret @@ -268,42 +268,42 @@ .class public auto ansi beforefieldinit CMain extends [mscorlib]System.Object { - .method public static void RunTest1() noinlining + .method public static void RunTest1() noinlining { newobj instance void class Invalid1<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest2() noinlining + .method public static void RunTest2() noinlining { newobj instance void class Invalid2<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest3() noinlining + .method public static void RunTest3() noinlining { newobj instance void class Invalid3<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest4() noinlining + .method public static void RunTest4() noinlining { newobj instance void class Invalid4<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest5() noinlining + .method public static void RunTest5() noinlining { newobj instance void class Invalid5<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest6() noinlining + .method public static void RunTest6() noinlining { newobj instance void class Invalid6<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) @@ -317,10 +317,10 @@ ) .entrypoint .maxstack 2 - .locals init (bool V_0) + .locals init (bool V_0) ldc.i4.1 stloc.0 - + T1: .try { @@ -332,13 +332,13 @@ leave.s T2 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T2 } - + T2: .try { @@ -350,10 +350,10 @@ leave.s T3 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T3 } @@ -368,10 +368,10 @@ leave.s T4 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T4 } @@ -386,10 +386,10 @@ leave.s T5 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T5 } @@ -404,10 +404,10 @@ leave.s T6 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T6 } @@ -422,28 +422,28 @@ leave.s DONE } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s DONE - } + } DONE: - + ldloc.0 brtrue.s PASS ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 100 ret } - + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { .maxstack 8 diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.il index 2064a845e5f..2c1f7c3aec2 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.il @@ -76,14 +76,14 @@ } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc(string& res) + .method public hidebysig newslot virtual instance object MyFunc(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -91,7 +91,7 @@ newobj instance void A::.ctor() ret } - .method public hidebysig newslot virtual instance class B MyFunc(string& res) + .method public hidebysig newslot virtual instance class B MyFunc(string& res) { ldarg.1 ldstr "B GenBaseType.MyFunc()" @@ -99,7 +99,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) + .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) { ldarg.1 ldstr "B GenBaseType.GenToNonGen()" @@ -107,7 +107,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) + .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) { ldarg.1 ldstr "B GenBaseType.NonGenThroughGenFunc()" @@ -115,7 +115,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<int32,object> GenBaseType.MyGenFunc()" @@ -123,7 +123,7 @@ newobj instance void class GenRetType<int32,object>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<!A, class Dictionary<string,!B>> GenBaseType.MyGenFunc()" @@ -131,7 +131,7 @@ newobj instance void class GenRetType<!A, class Dictionary<string,!B>>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A,!B> TestNonGenericDerived(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A,!B> TestNonGenericDerived(string& res) { ldarg.1 ldstr "GenRetType<!A,!B> GenBaseType.TestNonGenericDerived()" @@ -143,7 +143,7 @@ // ======================================================================================== -// SECOND LAYER type: overrides all virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides all virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -188,7 +188,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenRetType<!U,!V> NewFunc1(string& res) { .override method instance object class GenBaseType<!U,!V>::MyFunc(string& res) @@ -198,7 +198,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C NewFunc2(string& res) { .override method instance class B class GenBaseType<!U,!V>::MyFunc(string& res) @@ -280,7 +280,7 @@ ldnull ret } - + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } @@ -300,42 +300,42 @@ .class public auto ansi beforefieldinit CMain extends [mscorlib]System.Object { - .method public static void RunTest1() noinlining + .method public static void RunTest1() noinlining { newobj instance void class Invalid1<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest2() noinlining + .method public static void RunTest2() noinlining { newobj instance void class Invalid2<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest3() noinlining + .method public static void RunTest3() noinlining { newobj instance void class Invalid3<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest4() noinlining + .method public static void RunTest4() noinlining { newobj instance void class Invalid4<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest5() noinlining + .method public static void RunTest5() noinlining { newobj instance void class Invalid5<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest6() noinlining + .method public static void RunTest6() noinlining { newobj instance void class Invalid6<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) @@ -349,10 +349,10 @@ ) .entrypoint .maxstack 2 - .locals init (bool V_0) + .locals init (bool V_0) ldc.i4.1 stloc.0 - + T1: .try { @@ -364,13 +364,13 @@ leave.s T2 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T2 } - + T2: .try { @@ -382,10 +382,10 @@ leave.s T3 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T3 } @@ -400,10 +400,10 @@ leave.s T4 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T4 } @@ -418,10 +418,10 @@ leave.s T5 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T5 } @@ -436,10 +436,10 @@ leave.s T6 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T6 } @@ -454,28 +454,28 @@ leave.s DONE } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s DONE - } + } DONE: - + ldloc.0 brtrue.s PASS ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 100 ret } - + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { .maxstack 8 diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.il index 39c67576567..d923cc2f791 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.il @@ -25,33 +25,33 @@ .class interface public auto ansi abstract IGenDerive<V1,V2> implements class IGenRetType<!V1,!V2> { } // Structs implementing the interfaces -.class public sealed auto ansi A extends [mscorlib]System.ValueType +.class public sealed auto ansi A extends [mscorlib]System.ValueType implements IA { } -.class public sealed auto ansi B extends [mscorlib]System.ValueType +.class public sealed auto ansi B extends [mscorlib]System.ValueType implements IB { } -.class public sealed auto ansi RetType extends [mscorlib]System.ValueType +.class public sealed auto ansi RetType extends [mscorlib]System.ValueType implements class IGenRetType<int32,string> { } -.class public sealed auto ansi DerivedRetType extends [mscorlib]System.ValueType +.class public sealed auto ansi DerivedRetType extends [mscorlib]System.ValueType implements class IGenDerive<int32,string> { } -.class public sealed auto ansi GenRetType<U,V> extends [mscorlib]System.ValueType +.class public sealed auto ansi GenRetType<U,V> extends [mscorlib]System.ValueType implements class IGenRetType<!U, class IDictionary<string,!V>> { } -.class public sealed auto ansi DerivedGenRetType<U,V> extends [mscorlib]System.ValueType +.class public sealed auto ansi DerivedGenRetType<U,V> extends [mscorlib]System.ValueType implements class IGenDerive<!U, class IDictionary<string,!V>> { } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance class IA NonGen(string& res) + .method public hidebysig newslot virtual instance class IA NonGen(string& res) { ldarg.1 ldstr "IA GenBaseType.NonGen()" @@ -59,7 +59,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IGenRetType<int32,string> GenFunc(string& res) + .method public hidebysig newslot virtual instance class IGenRetType<int32,string> GenFunc(string& res) { ldarg.1 ldstr "IGenRetType<int32,string> GenBaseType.GenFunc()" @@ -67,7 +67,7 @@ ldnull ret } - .method public hidebysig newslot virtual instance class IGenRetType<!A, class IDictionary<string,!B>> GenFunc(string& res) + .method public hidebysig newslot virtual instance class IGenRetType<!A, class IDictionary<string,!B>> GenFunc(string& res) { ldarg.1 ldstr "IGenRetType<!A, class IDictionary<string,!B>> GenBaseType.GenFunc()" @@ -86,7 +86,7 @@ .class public auto ansi beforefieldinit Invalid1<U,V> extends class GenBaseType<!U,!V> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance valuetype A NonGen(string& res) + .method public hidebysig newslot virtual instance valuetype A NonGen(string& res) { .override method instance class IA class GenBaseType<!U,!V>::NonGen(string& res) .locals ( valuetype A ) @@ -98,7 +98,7 @@ .class public auto ansi beforefieldinit Invalid2<U,V> extends class GenBaseType<!U,!V> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance valuetype B NonGen(string& res) + .method public hidebysig newslot virtual instance valuetype B NonGen(string& res) { .override method instance class IA class GenBaseType<!U,!V>::NonGen(string& res) .locals ( valuetype B ) @@ -110,7 +110,7 @@ .class public auto ansi beforefieldinit Invalid3<U,V> extends class GenBaseType<!U,!V> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance valuetype RetType GenFunc(string& res) + .method public hidebysig newslot virtual instance valuetype RetType GenFunc(string& res) { .override method instance class IGenRetType<int32,string> class GenBaseType<!U,!V>::GenFunc(string& res) .locals ( valuetype RetType ) @@ -122,7 +122,7 @@ .class public auto ansi beforefieldinit Invalid4<U,V> extends class GenBaseType<!U,!V> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance valuetype DerivedRetType GenFunc(string& res) + .method public hidebysig newslot virtual instance valuetype DerivedRetType GenFunc(string& res) { .override method instance class IGenRetType<int32,string> class GenBaseType<!U,!V>::GenFunc(string& res) .locals ( valuetype DerivedRetType ) @@ -134,7 +134,7 @@ .class public auto ansi beforefieldinit Invalid5<U,V> extends class GenBaseType<!U,!V> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance valuetype GenRetType<!U,!V> GenFunc(string& res) + .method public hidebysig newslot virtual instance valuetype GenRetType<!U,!V> GenFunc(string& res) { .override method instance class IGenRetType<!U, class IDictionary<string,!V>> class GenBaseType<!U,!V>::GenFunc(string& res) .locals ( valuetype GenRetType<!U,!V> ) @@ -146,7 +146,7 @@ .class public auto ansi beforefieldinit Invalid6<U,V> extends class GenBaseType<!U,!V> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance valuetype DerivedGenRetType<!U,!V> GenFunc(string& res) + .method public hidebysig newslot virtual instance valuetype DerivedGenRetType<!U,!V> GenFunc(string& res) { .override method instance class IGenRetType<!U, class IDictionary<string,!V>> class GenBaseType<!U,!V>::GenFunc(string& res) .locals ( valuetype DerivedGenRetType<!U,!V> ) @@ -159,42 +159,42 @@ .class public auto ansi beforefieldinit CMain extends [mscorlib]System.Object { - .method public static void RunTest1() noinlining + .method public static void RunTest1() noinlining { newobj instance void class Invalid1<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest2() noinlining + .method public static void RunTest2() noinlining { newobj instance void class Invalid2<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest3() noinlining + .method public static void RunTest3() noinlining { newobj instance void class Invalid3<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest4() noinlining + .method public static void RunTest4() noinlining { newobj instance void class Invalid4<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest5() noinlining + .method public static void RunTest5() noinlining { newobj instance void class Invalid5<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunTest6() noinlining + .method public static void RunTest6() noinlining { newobj instance void class Invalid6<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) @@ -208,10 +208,10 @@ ) .entrypoint .maxstack 2 - .locals init (bool V_0) + .locals init (bool V_0) ldc.i4.1 stloc.0 - + T1: .try { @@ -223,13 +223,13 @@ leave.s T2 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T2 } - + T2: .try { @@ -241,10 +241,10 @@ leave.s T3 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T3 } @@ -259,10 +259,10 @@ leave.s T4 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T4 } @@ -277,10 +277,10 @@ leave.s T5 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T5 } @@ -295,10 +295,10 @@ leave.s T6 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s T6 } @@ -313,28 +313,28 @@ leave.s DONE } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s DONE } DONE: - + ldloc.0 brtrue.s PASS ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 100 ret } - + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il index fb803ab5441..53c72050884 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il @@ -11,126 +11,126 @@ // Types that will be used as return types on the various methods // ======================================================================================== -.class public auto ansi beforefieldinit A +.class public auto ansi beforefieldinit A { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit B extends A +.class public auto ansi beforefieldinit B extends A { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit C extends B +.class public auto ansi beforefieldinit C extends B { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit D extends C +.class public auto ansi beforefieldinit D extends C { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenRetType<X,Y> +.class public auto ansi beforefieldinit GenRetType<X,Y> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerivedRetType<X,Y> extends class GenRetType<!X,!Y> +.class public auto ansi beforefieldinit GenDerivedRetType<X,Y> extends class GenRetType<!X,!Y> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerivedRetType2<X,Y> extends class GenDerivedRetType<!X,!Y> +.class public auto ansi beforefieldinit GenDerivedRetType2<X,Y> extends class GenDerivedRetType<!X,!Y> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit Dictionary<KEY,VAL> +.class public auto ansi beforefieldinit Dictionary<KEY,VAL> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> +.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive4<T1,T2> extends class GenDerive3<!T1,!T2> +.class public auto ansi beforefieldinit GenDerive4<T1,T2> extends class GenDerive3<!T1,!T2> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> +.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> +.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> +.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 +.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived5 extends NonGenericDerived4 +.class public auto ansi beforefieldinit NonGenericDerived5 extends NonGenericDerived4 { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C +.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen4<T1,T2> extends class GenToNonGen3<!T1,!T2> +.class public auto ansi beforefieldinit GenToNonGen4<T1,T2> extends class GenToNonGen3<!T1,!T2> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C +.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> +.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 +.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen5 extends NonGenThroughGen4 +.class public auto ansi beforefieldinit NonGenThroughGen5 extends NonGenThroughGen4 { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc(string& res) + .method public hidebysig newslot virtual instance object MyFunc(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -138,7 +138,7 @@ newobj instance void A::.ctor() ret } - .method public hidebysig newslot virtual instance class B MyFunc(string& res) + .method public hidebysig newslot virtual instance class B MyFunc(string& res) { ldarg.1 ldstr "B GenBaseType.MyFunc()" @@ -146,7 +146,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) + .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) { ldarg.1 ldstr "B GenBaseType.GenToNonGen()" @@ -154,7 +154,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) + .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) { ldarg.1 ldstr "B GenBaseType.NonGenThroughGenFunc()" @@ -162,7 +162,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<int32,object> GenBaseType.MyGenFunc()" @@ -170,7 +170,7 @@ newobj instance void class GenRetType<int32,object>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<!A, class Dictionary<string,!B>> GenBaseType.MyGenFunc()" @@ -178,7 +178,7 @@ newobj instance void class GenRetType<!A, class Dictionary<string,!B>>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A,!B> TestNonGenericDerived(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A,!B> TestNonGenericDerived(string& res) { ldarg.1 ldstr "GenRetType<!A,!B> GenBaseType.TestNonGenericDerived()" @@ -190,7 +190,7 @@ // ======================================================================================== -// SECOND LAYER type: overrides all virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides all virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -235,7 +235,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenDerivedRetType<!U,!V> MyFunc(string& res) { .override method instance object class GenBaseType<!U,!V>::MyFunc(string& res) @@ -245,7 +245,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C MyFunc(string& res) { .override method instance class B class GenBaseType<!U,!V>::MyFunc(string& res) @@ -309,7 +309,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenDerivedRetType2<!U,!V> MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -320,7 +320,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class D MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -344,7 +344,7 @@ string a, [opt] string b, [opt] string c, - [opt] string d) cil managed + [opt] string d) cil managed { .param [3] = nullref .param [4] = nullref @@ -440,10 +440,10 @@ // 3) The signature from GenDerivedTestType with covariant returns // And verify that the override on GenDerivedTestType is the one that executes - .method public static bool RunTest1() noinlining + .method public static bool RunTest1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenDerivedTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -468,10 +468,10 @@ ret } - .method public static bool RunTest2() noinlining + .method public static bool RunTest2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenDerivedTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::MyFunc(string&) @@ -495,11 +495,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest3() noinlining + + .method public static bool RunTest3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenDerivedTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -524,10 +524,10 @@ ret } - .method public static bool RunTest4() noinlining + .method public static bool RunTest4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenDerivedTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -552,10 +552,10 @@ ret } - .method public static bool RunTest5() noinlining + .method public static bool RunTest5() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenDerivedTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen(string&) @@ -580,10 +580,10 @@ ret } - .method public static bool RunTest6() noinlining + .method public static bool RunTest6() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenDerivedTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -618,46 +618,46 @@ .entrypoint .maxstack 2 .locals init ( bool result ) - + ldc.i4.1 stloc.0 - + T1: call bool CMain::RunTest1() brtrue.s T2 ldc.i4.0 stloc.0 - + T2: call bool CMain::RunTest2() brtrue.s T3 ldc.i4.0 stloc.0 - + T3: call bool CMain::RunTest3() brtrue.s T4 ldc.i4.0 stloc.0 - + T4: call bool CMain::RunTest4() brtrue.s T5 ldc.i4.0 stloc.0 - + T5: call bool CMain::RunTest5() brtrue.s T6 ldc.i4.0 stloc.0 - + T6: call bool CMain::RunTest6() brtrue.s DONE ldc.i4.0 stloc.0 - + DONE: ldloc.0 brtrue.s PASS @@ -666,7 +666,7 @@ call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.il index 1f91183ae7f..795dc10671f 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.il @@ -13,97 +13,97 @@ .class public auto ansi beforefieldinit A { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit B extends A +.class public auto ansi beforefieldinit B extends A { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit C extends B +.class public auto ansi beforefieldinit C extends B { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenRetType<X,Y> +.class public auto ansi beforefieldinit GenRetType<X,Y> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit Dictionary<KEY,VAL> +.class public auto ansi beforefieldinit Dictionary<KEY,VAL> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> +.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> +.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> +.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> +.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 +.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C +.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C +.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> +.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 +.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc(string& res) + .method public hidebysig newslot virtual instance object MyFunc(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -111,7 +111,7 @@ newobj instance void A::.ctor() ret } - .method public hidebysig newslot virtual instance class B MyFunc(string& res) + .method public hidebysig newslot virtual instance class B MyFunc(string& res) { ldarg.1 ldstr "B GenBaseType.MyFunc()" @@ -119,7 +119,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) + .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) { ldarg.1 ldstr "B GenBaseType.GenToNonGen()" @@ -127,7 +127,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) + .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) { ldarg.1 ldstr "B GenBaseType.NonGenThroughGenFunc()" @@ -135,7 +135,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<int32,object> GenBaseType.MyGenFunc()" @@ -143,7 +143,7 @@ newobj instance void class GenRetType<int32,object>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<!A, class Dictionary<string,!B>> GenBaseType.MyGenFunc()" @@ -154,7 +154,7 @@ } // ======================================================================================== -// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -209,7 +209,7 @@ // ======================================================================================== -// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with +// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with // covariant return types (more derived return types than the ones used in GenMiddleType) // ======================================================================================== @@ -256,7 +256,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenRetType<!U,!V> MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -267,7 +267,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -278,7 +278,7 @@ ldnull ret } - + // ======================================================================================== // Set of implicit overrides that should be ignored given there are explicit overrides from the MethodImpls // ======================================================================================== @@ -309,14 +309,14 @@ newobj instance void [System.Runtime]System.Exception::.ctor(string) throw } - + .method public hidebysig virtual instance object MyFunc(string& res) { ldstr "Should never execute this method" newobj instance void [System.Runtime]System.Exception::.ctor(string) throw } - + .method public hidebysig virtual instance class B MyFunc(string& res) { ldstr "Should never execute this method" @@ -367,7 +367,7 @@ ldnull ret } - + .method public hidebysig virtual instance class GenRetType<!U,!V> MyFunc(string& res) { ldarg.1 @@ -376,7 +376,7 @@ ldnull ret } - + .method public hidebysig virtual instance class C MyFunc(string& res) { ldarg.1 @@ -435,7 +435,7 @@ ldnull ret } - + .method public hidebysig virtual instance class GenRetType<!U,!V> MyFunc_MethodImpl(string& res) { .override method instance class GenRetType<!2,!3> class GenTestType<!UNUSED1,!UNUSED2,!U,!V>::MyFunc(string& res) @@ -445,7 +445,7 @@ ldnull ret } - + .method public hidebysig virtual instance class C MyFunc_MethodImpl(string& res) { .override method instance class C class GenTestType<!UNUSED1,!UNUSED2,!U,!V>::MyFunc(string& res) @@ -468,7 +468,7 @@ string a, [opt] string b, [opt] string c, - [opt] string d) cil managed + [opt] string d) cil managed { .param [3] = nullref .param [4] = nullref @@ -560,14 +560,14 @@ // ============== Test using GenTestType ============== // // These test methods will callvirt each method using: // 1) The signature from GetBaseType - // 2) The signature from GenMiddleType with covariant returns (when applicable) + // 2) The signature from GenMiddleType with covariant returns (when applicable) // 3) The signature from GenTestType with covariant returns // And verify that the override on GetTestType is the one that executes - - .method public static bool RunTest1() noinlining + + .method public static bool RunTest1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -587,10 +587,10 @@ ret } - .method public static bool RunTest2() noinlining + .method public static bool RunTest2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::MyFunc(string&) @@ -609,11 +609,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest3() noinlining + + .method public static bool RunTest3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -638,10 +638,10 @@ ret } - .method public static bool RunTest4() noinlining + .method public static bool RunTest4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -666,10 +666,10 @@ ret } - .method public static bool RunTest5() noinlining + .method public static bool RunTest5() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen(string&) @@ -694,10 +694,10 @@ ret } - .method public static bool RunTest6() noinlining + .method public static bool RunTest6() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -729,11 +729,11 @@ // 3) The signature from GenTestType with covariant returns // 4) The signature from ImplicitOverrideToMethodImpls // And verify that the override on ImplicitOverrideToMethodImpls is the one that executes - - .method public static bool RunTest_ImplicitOverride1() noinlining + + .method public static bool RunTest_ImplicitOverride1() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ImplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -758,10 +758,10 @@ ret } - .method public static bool RunTest_ImplicitOverride2() noinlining + .method public static bool RunTest_ImplicitOverride2() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ImplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::MyFunc(string&) @@ -785,11 +785,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest_ImplicitOverride3() noinlining + + .method public static bool RunTest_ImplicitOverride3() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ImplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -819,10 +819,10 @@ ret } - .method public static bool RunTest_ImplicitOverride4() noinlining + .method public static bool RunTest_ImplicitOverride4() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ImplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -852,10 +852,10 @@ ret } - .method public static bool RunTest_ImplicitOverride5() noinlining + .method public static bool RunTest_ImplicitOverride5() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ImplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen(string&) @@ -885,10 +885,10 @@ ret } - .method public static bool RunTest_ImplicitOverride6() noinlining + .method public static bool RunTest_ImplicitOverride6() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ImplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -925,11 +925,11 @@ // 3) The signature from GenTestType with covariant returns // 4) The signature from ExplicitOverrideToMethodImpls // And verify that the override on ExplicitOverrideToMethodImpls is the one that executes - - .method public static bool RunTest_ExplicitOverride1() noinlining + + .method public static bool RunTest_ExplicitOverride1() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ExplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -954,10 +954,10 @@ ret } - .method public static bool RunTest_ExplicitOverride2() noinlining + .method public static bool RunTest_ExplicitOverride2() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ExplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::MyFunc(string&) @@ -981,11 +981,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest_ExplicitOverride3() noinlining + + .method public static bool RunTest_ExplicitOverride3() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ExplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1015,10 +1015,10 @@ ret } - .method public static bool RunTest_ExplicitOverride4() noinlining + .method public static bool RunTest_ExplicitOverride4() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ExplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1048,10 +1048,10 @@ ret } - .method public static bool RunTest_ExplicitOverride5() noinlining + .method public static bool RunTest_ExplicitOverride5() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ExplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen(string&) @@ -1081,10 +1081,10 @@ ret } - .method public static bool RunTest_ExplicitOverride6() noinlining + .method public static bool RunTest_ExplicitOverride6() noinlining { .locals init (string res1, string res2, string res3, string res4) - + newobj instance void class ExplicitOverrideToMethodImpls<int32,object,int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -1118,12 +1118,12 @@ // These test methods will callvirt each method using: // 1) The signature from GetBaseType // 2) The signature from GenMiddleType with covariant returns - // And verify that the override on GenMiddleType is the one that executes - - .method public static bool RunTest_Middle1() noinlining + // And verify that the override on GenMiddleType is the one that executes + + .method public static bool RunTest_Middle1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1143,10 +1143,10 @@ ret } - .method public static bool RunTest_Middle2() noinlining + .method public static bool RunTest_Middle2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1166,10 +1166,10 @@ ret } - .method public static bool RunTest_Middle3() noinlining + .method public static bool RunTest_Middle3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen(string&) @@ -1189,10 +1189,10 @@ ret } - .method public static bool RunTest_Middle4() noinlining + .method public static bool RunTest_Middle4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<object,int32>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -1211,9 +1211,9 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - + // ===================================================================================== // - + .method public hidebysig static int32 Main( string[] args) cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -1222,72 +1222,72 @@ .entrypoint .maxstack 2 .locals init ( bool result ) - + ldc.i4.1 stloc.0 - + T1: call bool CMain::RunTest1() brtrue.s T2 ldc.i4.0 stloc.0 - + T2: call bool CMain::RunTest2() brtrue.s T3 ldc.i4.0 stloc.0 - + T3: call bool CMain::RunTest3() brtrue.s T4 ldc.i4.0 stloc.0 - + T4: call bool CMain::RunTest4() brtrue.s T5 ldc.i4.0 stloc.0 - + T5: call bool CMain::RunTest5() brtrue.s T6 ldc.i4.0 stloc.0 - + T6: call bool CMain::RunTest6() brtrue.s M1 ldc.i4.0 stloc.0 - + // ===================================================================================== // - + M1: call bool CMain::RunTest_Middle1() brtrue.s M2 ldc.i4.0 stloc.0 - + M2: call bool CMain::RunTest_Middle2() brtrue.s M3 ldc.i4.0 stloc.0 - + M3: call bool CMain::RunTest_Middle3() brtrue.s M4 ldc.i4.0 stloc.0 - + M4: call bool CMain::RunTest_Middle4() brtrue.s IMP_OVERRIDE1 ldc.i4.0 stloc.0 - + // ===================================================================================== // IMP_OVERRIDE1: @@ -1295,37 +1295,37 @@ brtrue.s IMP_OVERRIDE2 ldc.i4.0 stloc.0 - + IMP_OVERRIDE2: call bool CMain::RunTest_ImplicitOverride2() brtrue.s IMP_OVERRIDE3 ldc.i4.0 stloc.0 - + IMP_OVERRIDE3: call bool CMain::RunTest_ImplicitOverride3() brtrue.s IMP_OVERRIDE4 ldc.i4.0 stloc.0 - + IMP_OVERRIDE4: call bool CMain::RunTest_ImplicitOverride4() brtrue.s IMP_OVERRIDE5 ldc.i4.0 stloc.0 - + IMP_OVERRIDE5: call bool CMain::RunTest_ImplicitOverride5() brtrue.s IMP_OVERRIDE6 ldc.i4.0 stloc.0 - + IMP_OVERRIDE6: call bool CMain::RunTest_ImplicitOverride6() brtrue.s EXP_OVERRIDE1 ldc.i4.0 - stloc.0 - + stloc.0 + // ===================================================================================== // EXP_OVERRIDE1: @@ -1333,36 +1333,36 @@ brtrue.s EXP_OVERRIDE2 ldc.i4.0 stloc.0 - + EXP_OVERRIDE2: call bool CMain::RunTest_ExplicitOverride2() brtrue.s EXP_OVERRIDE3 ldc.i4.0 stloc.0 - + EXP_OVERRIDE3: call bool CMain::RunTest_ExplicitOverride3() brtrue.s EXP_OVERRIDE4 ldc.i4.0 stloc.0 - + EXP_OVERRIDE4: call bool CMain::RunTest_ExplicitOverride4() brtrue.s EXP_OVERRIDE5 ldc.i4.0 stloc.0 - + EXP_OVERRIDE5: call bool CMain::RunTest_ExplicitOverride5() brtrue.s EXP_OVERRIDE6 ldc.i4.0 stloc.0 - + EXP_OVERRIDE6: call bool CMain::RunTest_ExplicitOverride6() brtrue.s DONE ldc.i4.0 - stloc.0 + stloc.0 // ===================================================================================== // @@ -1374,7 +1374,7 @@ call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il index 5ee3b7f6b85..e5c59af4ac7 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il @@ -13,85 +13,85 @@ .class public auto ansi beforefieldinit A { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit B extends A +.class public auto ansi beforefieldinit B extends A { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit C extends B +.class public auto ansi beforefieldinit C extends B { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenRetType<X,Y> +.class public auto ansi beforefieldinit GenRetType<X,Y> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit Dictionary<KEY,VAL> +.class public auto ansi beforefieldinit Dictionary<KEY,VAL> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> +.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> +.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> +.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> +.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 +.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C +.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C +.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> +.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 +.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } .class private auto ansi sealed En extends [System.Runtime]System.Enum @@ -101,14 +101,14 @@ // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc(string& res) + .method public hidebysig newslot virtual instance object MyFunc(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -116,7 +116,7 @@ newobj instance void A::.ctor() ret } - .method public hidebysig newslot virtual instance class B MyFunc(string& res) + .method public hidebysig newslot virtual instance class B MyFunc(string& res) { ldarg.1 ldstr "B GenBaseType.MyFunc()" @@ -124,7 +124,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) + .method public hidebysig newslot virtual instance class B GenToNonGen(string& res) { ldarg.1 ldstr "B GenBaseType.GenToNonGen()" @@ -132,7 +132,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) + .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc(string& res) { ldarg.1 ldstr "B GenBaseType.NonGenThroughGenFunc()" @@ -140,7 +140,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<int32,object> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<int32,object> GenBaseType.MyGenFunc()" @@ -148,7 +148,7 @@ newobj instance void class GenRetType<int32,object>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<string,!B>> MyGenFunc(string& res) { ldarg.1 ldstr "GenRetType<!A, class Dictionary<string,!B>> GenBaseType.MyGenFunc()" @@ -157,17 +157,17 @@ ret } - .method public hidebysig newslot virtual instance int32[] RetIntArr() + .method public hidebysig newslot virtual instance int32[] RetIntArr() { ldstr "base.retintarr" call void [System.Console]System.Console::WriteLine(string) - ldnull + ldnull ret } } // ======================================================================================== -// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -222,7 +222,7 @@ // ======================================================================================== -// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with +// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with // covariant return types (more derived return types than the ones used in GenMiddleType) // ======================================================================================== @@ -269,7 +269,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenRetType<!U,!V> MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -280,7 +280,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C MyFunc(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -291,7 +291,7 @@ ldnull ret } - + // ======================================================================================== // Set of implicit overrides that should be ignored given there are explicit overrides from the MethodImpls // ======================================================================================== @@ -322,14 +322,14 @@ newobj instance void [System.Runtime]System.Exception::.ctor(string) throw } - + .method public hidebysig virtual instance object MyFunc(string& res) { ldstr "Should never execute this method" newobj instance void [System.Runtime]System.Exception::.ctor(string) throw } - + .method public hidebysig virtual instance class B MyFunc(string& res) { ldstr "Should never execute this method" @@ -345,26 +345,26 @@ .class private auto ansi sealed Del_Obj extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_Obj::.ctor - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance object Invoke(string& res) runtime managed { } // end of method Del_Obj::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_Obj::BeginInvoke - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance object EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -374,26 +374,26 @@ .class private auto ansi sealed Del_B extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_B::.ctor - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance class B Invoke(string& res) runtime managed { } // end of method Del_B::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_B::BeginInvoke - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance class B EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -403,28 +403,28 @@ .class private auto ansi sealed Del_GenRetType_int_object extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenRetType_int_object::.ctor - .method public hidebysig newslot virtual - instance class GenRetType<int32,object> + .method public hidebysig newslot virtual + instance class GenRetType<int32,object> Invoke(string& res) runtime managed { } // end of method Del_GenRetType_int_object::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenRetType_int_object::BeginInvoke - .method public hidebysig newslot virtual - instance class GenRetType<int32,object> + .method public hidebysig newslot virtual + instance class GenRetType<int32,object> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -434,28 +434,28 @@ .class private auto ansi sealed Del_GenRetType<ARG1,ARG2> extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenRetType::.ctor - .method public hidebysig newslot virtual - instance class GenRetType<!ARG1,class Dictionary<string,!ARG2>> + .method public hidebysig newslot virtual + instance class GenRetType<!ARG1,class Dictionary<string,!ARG2>> Invoke(string& res) runtime managed { } // end of method Del_GenRetType::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenRetType::BeginInvoke - .method public hidebysig newslot virtual - instance class GenRetType<!ARG1,class Dictionary<string,!ARG2>> + .method public hidebysig newslot virtual + instance class GenRetType<!ARG1,class Dictionary<string,!ARG2>> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -465,28 +465,28 @@ .class private auto ansi sealed Del_NonGenThroughGen2 extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_NonGenThroughGen2::.ctor - .method public hidebysig newslot virtual - instance class NonGenThroughGen2<object,int32,string> + .method public hidebysig newslot virtual + instance class NonGenThroughGen2<object,int32,string> Invoke(string& res) runtime managed { } // end of method Del_NonGenThroughGen2::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_NonGenThroughGen2::BeginInvoke - .method public hidebysig newslot virtual - instance class NonGenThroughGen2<object,int32,string> + .method public hidebysig newslot virtual + instance class NonGenThroughGen2<object,int32,string> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -496,28 +496,28 @@ .class private auto ansi sealed Del_GenToNonGen1<V> extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenToNonGen1::.ctor - .method public hidebysig newslot virtual - instance class GenToNonGen1<!V,class Dictionary<string,object>> + .method public hidebysig newslot virtual + instance class GenToNonGen1<!V,class Dictionary<string,object>> Invoke(string& res) runtime managed { } // end of method Del_GenToNonGen1::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenToNonGen1::BeginInvoke - .method public hidebysig newslot virtual - instance class GenToNonGen1<!V,class Dictionary<string,object>> + .method public hidebysig newslot virtual + instance class GenToNonGen1<!V,class Dictionary<string,object>> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -527,28 +527,28 @@ .class private auto ansi sealed Del_NonGenericDerived1 extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_NonGenericDerived1::.ctor - .method public hidebysig newslot virtual - instance class NonGenericDerived1<int32,object> + .method public hidebysig newslot virtual + instance class NonGenericDerived1<int32,object> Invoke(string& res) runtime managed { } // end of method Del_NonGenericDerived1::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_NonGenericDerived1::BeginInvoke - .method public hidebysig newslot virtual - instance class NonGenericDerived1<int32,object> + .method public hidebysig newslot virtual + instance class NonGenericDerived1<int32,object> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -558,28 +558,28 @@ .class private auto ansi sealed Del_GenDerive1<U,V> extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenDerive1::.ctor - .method public hidebysig newslot virtual - instance class GenDerive1<!V,class Dictionary<string,!U>> + .method public hidebysig newslot virtual + instance class GenDerive1<!V,class Dictionary<string,!U>> Invoke(string& res) runtime managed { } // end of method Del_GenDerive1::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenDerive1::BeginInvoke - .method public hidebysig newslot virtual - instance class GenDerive1<!V,class Dictionary<string,!U>> + .method public hidebysig newslot virtual + instance class GenDerive1<!V,class Dictionary<string,!U>> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -589,28 +589,28 @@ .class private auto ansi sealed Del_NonGenThroughGen4 extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_NonGenThroughGen4::.ctor - .method public hidebysig newslot virtual - instance class NonGenThroughGen4 + .method public hidebysig newslot virtual + instance class NonGenThroughGen4 Invoke(string& res) runtime managed { } // end of method Del_NonGenThroughGen4::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_NonGenThroughGen4::BeginInvoke - .method public hidebysig newslot virtual - instance class NonGenThroughGen4 + .method public hidebysig newslot virtual + instance class NonGenThroughGen4 EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -620,28 +620,28 @@ .class private auto ansi sealed Del_GenToNonGen3<U> extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenToNonGen3::.ctor - .method public hidebysig newslot virtual - instance class GenToNonGen3<!U,object> + .method public hidebysig newslot virtual + instance class GenToNonGen3<!U,object> Invoke(string& res) runtime managed { } // end of method Del_GenToNonGen3::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenToNonGen3::BeginInvoke - .method public hidebysig newslot virtual - instance class GenToNonGen3<!U,object> + .method public hidebysig newslot virtual + instance class GenToNonGen3<!U,object> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -651,28 +651,28 @@ .class private auto ansi sealed Del_NonGenericDerived4 extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_NonGenericDerived4::.ctor - .method public hidebysig newslot virtual - instance class NonGenericDerived4 + .method public hidebysig newslot virtual + instance class NonGenericDerived4 Invoke(string& res) runtime managed { } // end of method Del_NonGenericDerived4::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_NonGenericDerived4::BeginInvoke - .method public hidebysig newslot virtual - instance class NonGenericDerived4 + .method public hidebysig newslot virtual + instance class NonGenericDerived4 EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -682,28 +682,28 @@ .class private auto ansi sealed Del_GenDerive3<U,V> extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenDerive3::.ctor - .method public hidebysig newslot virtual - instance class GenDerive3<!U,!V> + .method public hidebysig newslot virtual + instance class GenDerive3<!U,!V> Invoke(string& res) runtime managed { } // end of method Del_GenDerive3::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenDerive3::BeginInvoke - .method public hidebysig newslot virtual - instance class GenDerive3<!U,!V> + .method public hidebysig newslot virtual + instance class GenDerive3<!U,!V> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -713,28 +713,28 @@ .class private auto ansi sealed Del_GenRetType_U_V<U,V> extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_GenRetType_U_V::.ctor - .method public hidebysig newslot virtual - instance class GenRetType<!U,!V> + .method public hidebysig newslot virtual + instance class GenRetType<!U,!V> Invoke(string& res) runtime managed { } // end of method Del_GenRetType_U_V::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_GenRetType_U_V::BeginInvoke - .method public hidebysig newslot virtual - instance class GenRetType<!U,!V> + .method public hidebysig newslot virtual + instance class GenRetType<!U,!V> EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -744,26 +744,26 @@ .class private auto ansi sealed Del_C extends [System.Runtime]System.MulticastDelegate { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor(object 'object', native int 'method') runtime managed { } // end of method Del_C::.ctor - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance class C Invoke(string& res) runtime managed { } // end of method Del_C::Invoke - .method public hidebysig newslot virtual - instance class [System.Runtime]System.IAsyncResult + .method public hidebysig newslot virtual + instance class [System.Runtime]System.IAsyncResult BeginInvoke(string& res, class [System.Runtime]System.AsyncCallback callback, object 'object') runtime managed { } // end of method Del_C::BeginInvoke - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance class C EndInvoke(string& res, class [System.Runtime]System.IAsyncResult result) runtime managed { @@ -869,21 +869,21 @@ IL_00a3: ret } // end of method Program::CheckResults - + // ============== Test using GenTestType ============== // // These test methods will callvirt each method using: // 1) The signature from GetBaseType - // 2) The signature from GenMiddleType with covariant returns (when applicable) + // 2) The signature from GenMiddleType with covariant returns (when applicable) // 3) The signature from GenTestType with covariant returns // And verify that the override on GetTestType is the one that executes .method public hidebysig static bool RunTest1() cil managed noinlining { .locals init (string res1, string res2, string res3, class GenTestType<int32,object,int32,object> thisPtr) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() stloc.s thisPtr - + ldloc.s thisPtr ldloc.s thisPtr ldvirtftn instance object class GenBaseType<int32,object>::MyFunc(string&) @@ -912,10 +912,10 @@ .method public hidebysig static bool RunTest2() cil managed noinlining { .locals init (string res1, string res2, string res3, class GenTestType<int32,object,int32,object> thisPtr) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() stloc.s thisPtr - + ldloc.s thisPtr ldloc.s thisPtr ldvirtftn instance class B class GenBaseType<int32,object>::MyFunc(string&) @@ -944,10 +944,10 @@ .method public hidebysig static bool RunTest3() cil managed noinlining { .locals init (string res1, string res2, string res3, class GenTestType<int32,object,int32,object> thisPtr) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() stloc.s thisPtr - + ldloc.s thisPtr ldloc.s thisPtr ldvirtftn instance class GenRetType<!0, class Dictionary<string,!1>> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -984,10 +984,10 @@ .method public hidebysig static bool RunTest4() cil managed noinlining { .locals init (string res1, string res2, string res3, class GenTestType<int32,object,int32,object> thisPtr) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() stloc.s thisPtr - + ldloc.s thisPtr ldloc.s thisPtr ldvirtftn instance class GenRetType<int32,object> class GenBaseType<int32,object>::MyGenFunc(string&) @@ -1018,16 +1018,16 @@ ldloc.2 ldnull call bool CMain::CheckResults(string,string,string,string,string) - ret + ret } .method public hidebysig static bool RunTest5() cil managed noinlining { .locals init (string res1, string res2, string res3, class GenTestType<int32,object,int32,object> thisPtr) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() stloc.s thisPtr - + ldloc.s thisPtr ldloc.s thisPtr ldvirtftn instance class B class GenBaseType<int32,object>::GenToNonGen(string&) @@ -1064,10 +1064,10 @@ .method public hidebysig static bool RunTest6() cil managed noinlining { .locals init (string res1, string res2, string res3, class GenTestType<int32,object,int32,object> thisPtr) - + newobj instance void class GenTestType<int32,object,int32,object>::.ctor() stloc.s thisPtr - + ldloc.s thisPtr ldloc.s thisPtr ldvirtftn instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc(string&) @@ -1109,40 +1109,40 @@ .entrypoint .maxstack 2 .locals init ( bool result ) - + ldc.i4.1 stloc.0 - + T1: call bool CMain::RunTest1() brtrue.s T2 ldc.i4.0 stloc.0 - + T2: call bool CMain::RunTest2() brtrue.s T3 ldc.i4.0 stloc.0 - + T3: call bool CMain::RunTest3() brtrue.s T4 ldc.i4.0 stloc.0 - + T4: call bool CMain::RunTest4() brtrue.s T5 ldc.i4.0 stloc.0 - + T5: call bool CMain::RunTest5() brtrue.s T6 ldc.i4.0 stloc.0 - + T6: call bool CMain::RunTest6() brtrue.s DONE @@ -1159,7 +1159,7 @@ call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.il index 67e5b8f185b..e655e41217e 100644 --- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.il +++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.il @@ -11,107 +11,107 @@ // Types that will be used as return types on the various methods // ======================================================================================== -.class public auto ansi beforefieldinit A +.class public auto ansi beforefieldinit A { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit B extends A +.class public auto ansi beforefieldinit B extends A { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit C extends B +.class public auto ansi beforefieldinit C extends B { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenRetType<X,Y> +.class public auto ansi beforefieldinit GenRetType<X,Y> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit Dictionary<KEY,VAL> +.class public auto ansi beforefieldinit Dictionary<KEY,VAL> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> +.class public auto ansi beforefieldinit GenDerive1<V1,V2> extends class GenRetType<!V1,!V2> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenDerive2<U1,U2,U3> extends class GenDerive1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenDerive3<T1,T2> extends class GenDerive2<!T1,!T2,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> +.class public auto ansi beforefieldinit NonGenericDerived1<ARG1,ARG2> extends class GenRetType<!ARG1,!ARG2> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> +.class public auto ansi beforefieldinit NonGenericDerived2<T> extends class NonGenericDerived1<!T,object> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> +.class public auto ansi beforefieldinit NonGenericDerived3 extends class NonGenericDerived2<int32> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 +.class public auto ansi beforefieldinit NonGenericDerived4 extends NonGenericDerived3 { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenericDerived5<T> extends class NonGenericDerived1<int32,!T> +.class public auto ansi beforefieldinit NonGenericDerived5<T> extends class NonGenericDerived1<int32,!T> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C +.class public auto ansi beforefieldinit GenToNonGen1<V1,V2> extends C { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit GenToNonGen2<U1,U2,U3> extends class GenToNonGen1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> +.class public auto ansi beforefieldinit GenToNonGen3<T1,T2> extends class GenToNonGen2<!T1,!T2,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C +.class public auto ansi beforefieldinit NonGenThroughGen1<V1,V2> extends C { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> +.class public auto ansi beforefieldinit NonGenThroughGen2<U1,U2,U3> extends class NonGenThroughGen1<!U1, class Dictionary<!U3,!U2>> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> +.class public auto ansi beforefieldinit NonGenThroughGen3 extends class NonGenThroughGen2<object,int32,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 +.class public auto ansi beforefieldinit NonGenThroughGen4 extends NonGenThroughGen3 { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } -.class public auto ansi beforefieldinit NonGenThroughGen5<T> extends class NonGenThroughGen2<object,int32,!T> +.class public auto ansi beforefieldinit NonGenThroughGen5<T> extends class NonGenThroughGen2<object,int32,!T> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } // ======================================================================================== -// Main base type with various virtual methods that will be overriden later +// Main base type with various virtual methods that will be overridden later // ======================================================================================== .class public auto ansi beforefieldinit GenBaseType<A,B> { .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } - .method public hidebysig newslot virtual instance object MyFunc<Z>(string& res) + .method public hidebysig newslot virtual instance object MyFunc<Z>(string& res) { ldarg.1 ldstr "object GenBaseType.MyFunc()" @@ -119,7 +119,7 @@ newobj instance void A::.ctor() ret } - .method public hidebysig newslot virtual instance class B MyFunc<Z>(string& res) + .method public hidebysig newslot virtual instance class B MyFunc<Z>(string& res) { ldarg.1 ldstr "B GenBaseType.MyFunc()" @@ -127,7 +127,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B GenToNonGen<Z>(string& res) + .method public hidebysig newslot virtual instance class B GenToNonGen<Z>(string& res) { ldarg.1 ldstr "B GenBaseType.GenToNonGen()" @@ -135,7 +135,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc<Z>(string& res) + .method public hidebysig newslot virtual instance class B NonGenThroughGenFunc<Z>(string& res) { ldarg.1 ldstr "B GenBaseType.NonGenThroughGenFunc()" @@ -143,7 +143,7 @@ newobj instance void B::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<int32,!!Z> MyGenFunc<Z>(string& res) + .method public hidebysig newslot virtual instance class GenRetType<int32,!!Z> MyGenFunc<Z>(string& res) { ldarg.1 ldstr "GenRetType<int32,!!Y> GenBaseType.MyGenFunc()" @@ -151,7 +151,7 @@ newobj instance void class GenRetType<int32,!!Z>::.ctor() ret } - .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<!!Z,!B>> MyGenFunc<Z>(string& res) + .method public hidebysig newslot virtual instance class GenRetType<!A, class Dictionary<!!Z,!B>> MyGenFunc<Z>(string& res) { ldarg.1 ldstr "GenRetType<!A, class Dictionary<!!Y,!B>> GenBaseType.MyGenFunc()" @@ -163,7 +163,7 @@ // ======================================================================================== -// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with +// SECOND LAYER type: overrides *SOME* virtuals on GenBaseType using MethodImpls with // covariant return types (more derived return types) // ======================================================================================== @@ -213,11 +213,11 @@ stind.ref ldnull ret - } + } } // ======================================================================================== -// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with +// THIRD LAYER type: overrides all virtuals from GenBaseType using MethodImpls with // covariant return types (more derived return types than the ones used in GenMiddleType) // ======================================================================================== @@ -262,7 +262,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class GenRetType<!U,!V> MyFunc<Y>(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -273,7 +273,7 @@ ldnull ret } - + .method public hidebysig newslot virtual instance class C MyFunc<Y>(string& res) { .custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = (01 00 00 00) @@ -303,7 +303,7 @@ ldnull ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } .class public auto ansi beforefieldinit Invalid2<U,V> extends class GenMiddleType<!U,!V> { @@ -314,7 +314,7 @@ ldnull ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } .class public auto ansi beforefieldinit Invalid3<U,V> extends class GenMiddleType<!U,!V> { @@ -325,7 +325,7 @@ ldnull ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } .class public auto ansi beforefieldinit Invalid4<U,V> extends class GenMiddleType<!U,!V> { @@ -336,7 +336,7 @@ ldnull ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { ret } } // ======================================================================================== @@ -348,7 +348,7 @@ string a, [opt] string b, [opt] string c, - [opt] string d) cil managed + [opt] string d) cil managed { .param [3] = nullref .param [4] = nullref @@ -440,14 +440,14 @@ // ============== Test using GenTestType ============== // // These test methods will callvirt each method using: // 1) The signature from GetBaseType - // 2) The signature from GenMiddleType with covariant returns (when applicable) + // 2) The signature from GenMiddleType with covariant returns (when applicable) // 3) The signature from GenTestType with covariant returns // And verify that the override on GetTestType is the one that executes - - .method public static bool RunTest1() noinlining + + .method public static bool RunTest1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance object class GenBaseType<int32,object>::MyFunc<class CMain>(string&) @@ -467,10 +467,10 @@ ret } - .method public static bool RunTest2() noinlining + .method public static bool RunTest2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::MyFunc<class CMain>(string&) @@ -489,11 +489,11 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - - .method public static bool RunTest3() noinlining + + .method public static bool RunTest3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<!!0,!1>> class GenBaseType<int32,object>::MyGenFunc<class CMain>(string&) @@ -518,10 +518,10 @@ ret } - .method public static bool RunTest4() noinlining + .method public static bool RunTest4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,!!0> class GenBaseType<int32,object>::MyGenFunc<class CMain>(string&) @@ -546,10 +546,10 @@ ret } - .method public static bool RunTest5() noinlining + .method public static bool RunTest5() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen<class CMain>(string&) @@ -574,10 +574,10 @@ ret } - .method public static bool RunTest6() noinlining + .method public static bool RunTest6() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenTestType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc<class CMain>(string&) @@ -606,12 +606,12 @@ // These test methods will callvirt each method using: // 1) The signature from GetBaseType // 2) The signature from GenMiddleType with covariant returns - // And verify that the override on GenMiddleType is the one that executes - - .method public static bool RunTest_Middle1() noinlining + // And verify that the override on GenMiddleType is the one that executes + + .method public static bool RunTest_Middle1() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<!0, class Dictionary<!!0,!1>> class GenBaseType<int32,object>::MyGenFunc<class CMain>(string&) @@ -631,10 +631,10 @@ ret } - .method public static bool RunTest_Middle2() noinlining + .method public static bool RunTest_Middle2() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<int32,object>::.ctor() ldloca.s 0 callvirt instance class GenRetType<int32,!!0> class GenBaseType<int32,object>::MyGenFunc<class CMain>(string&) @@ -654,10 +654,10 @@ ret } - .method public static bool RunTest_Middle3() noinlining + .method public static bool RunTest_Middle3() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::GenToNonGen<class CMain>(string&) @@ -677,10 +677,10 @@ ret } - .method public static bool RunTest_Middle4() noinlining + .method public static bool RunTest_Middle4() noinlining { .locals init (string res1, string res2, string res3) - + newobj instance void class GenMiddleType<int32,object>::.ctor() ldloca.s 0 callvirt instance class B class GenBaseType<int32,object>::NonGenThroughGenFunc<class CMain>(string&) @@ -699,33 +699,33 @@ call bool CMain::CheckResults(string,string,string,string,string) ret } - + // ============== Test using GenMiddleType ============== // // These test methods attempt to load the invalid types, and are // expected to throw a TypeLoadException (caught by Main()) - - .method public static void RunInvalidTest1() noinlining + + .method public static void RunInvalidTest1() noinlining { newobj instance void class Invalid1<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunInvalidTest2() noinlining + .method public static void RunInvalidTest2() noinlining { newobj instance void class Invalid2<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunInvalidTest3() noinlining + .method public static void RunInvalidTest3() noinlining { newobj instance void class Invalid3<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) ret } - .method public static void RunInvalidTest4() noinlining + .method public static void RunInvalidTest4() noinlining { newobj instance void class Invalid4<int32,object>::.ctor() call void [System.Console]System.Console::WriteLine(object) @@ -741,70 +741,70 @@ .entrypoint .maxstack 2 .locals init ( bool result ) - + ldc.i4.1 stloc.0 - + T1: call bool CMain::RunTest1() brtrue.s T2 ldc.i4.0 stloc.0 - + T2: call bool CMain::RunTest2() brtrue.s T3 ldc.i4.0 stloc.0 - + T3: call bool CMain::RunTest3() brtrue.s T4 ldc.i4.0 stloc.0 - + T4: call bool CMain::RunTest4() brtrue.s T5 ldc.i4.0 stloc.0 - + T5: call bool CMain::RunTest5() brtrue.s T6 ldc.i4.0 stloc.0 - + T6: call bool CMain::RunTest6() brtrue.s M1 ldc.i4.0 stloc.0 - + M1: call bool CMain::RunTest_Middle1() brtrue.s M2 ldc.i4.0 stloc.0 - + M2: call bool CMain::RunTest_Middle2() brtrue.s M3 ldc.i4.0 stloc.0 - + M3: call bool CMain::RunTest_Middle3() brtrue.s M4 ldc.i4.0 stloc.0 - + M4: call bool CMain::RunTest_Middle4() brtrue.s INVALID1 ldc.i4.0 stloc.0 - + INVALID1: .try { @@ -816,13 +816,13 @@ leave.s INVALID2 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s INVALID2 } - + INVALID2: .try { @@ -834,10 +834,10 @@ leave.s INVALID3 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s INVALID3 } @@ -852,10 +852,10 @@ leave.s INVALID4 } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s INVALID4 } @@ -870,10 +870,10 @@ leave.s DONE } catch [mscorlib]System.TypeLoadException - { + { ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s DONE } @@ -885,7 +885,7 @@ call void [System.Console]System.Console::WriteLine(string) ldc.i4.s 101 ret - + PASS: ldstr "Test PASSED" call void [System.Console]System.Console::WriteLine(string) diff --git a/src/tests/Loader/classloader/MethodImpl/Desktop/README.txt b/src/tests/Loader/classloader/MethodImpl/Desktop/README.txt index a0335de5e13..441e8692c3c 100644 --- a/src/tests/Loader/classloader/MethodImpl/Desktop/README.txt +++ b/src/tests/Loader/classloader/MethodImpl/Desktop/README.txt @@ -18,10 +18,10 @@ the same class actually invokes the .override method. That is because there's only one slot for the method in the method table, and by using .override, we have determined that the .override method gets that slot. So it won't matter whether the method is called virtually or -non-virtually, the result is the same. +non-virtually, the result is the same. Another consequence of this is that if the original declaration that -is being overriden has a body itself and then is .overriden in the +is being overridden has a body itself and then is .overridden in the same class, it will be impossible to invoke that original method, regardless of whether calls are virtual or non-virtual. diff --git a/src/tests/Loader/classloader/MethodImpl/Desktop/override_override1.il b/src/tests/Loader/classloader/MethodImpl/Desktop/override_override1.il index f951fafeeba..4cc57bfa575 100644 --- a/src/tests/Loader/classloader/MethodImpl/Desktop/override_override1.il +++ b/src/tests/Loader/classloader/MethodImpl/Desktop/override_override1.il @@ -5,14 +5,14 @@ // MyBar is a normal reference type that extends MyFoo. // MyBar::DoBar explicitly overrides MyFoo::DoFoo // MyBar::DoBarOverride explicitly overrides MyBar::DoBar -// Expect TypeLoadException when loading MyBar because on override is being overriden. +// Expect TypeLoadException when loading MyBar because on override is being overridden. .assembly extern mscorlib{} .assembly override_override1{} .class public auto ansi beforefieldinit MyFoo{ - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) @@ -34,7 +34,7 @@ .class public auto ansi beforefieldinit MyBar extends MyFoo { - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 DoBar() { .maxstack 1 @@ -51,7 +51,7 @@ } // end of method MyBar::DoBar - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 DoBarOverride() { // Code size 16 (0x10) @@ -69,7 +69,7 @@ } - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) @@ -114,10 +114,10 @@ call void [mscorlib]System.Console::WriteLine(string) leave.s L1 } - catch [mscorlib]System.TypeLoadException{ + catch [mscorlib]System.TypeLoadException{ ldstr "Caught expected TypeLoadException:" call void [mscorlib]System.Console::WriteLine(string) - call void [mscorlib]System.Console::WriteLine(object) + call void [mscorlib]System.Console::WriteLine(object) leave.s L1 } @@ -141,7 +141,7 @@ IL_002a: ret } // end of method CMain::Main - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) diff --git a/src/tests/Loader/classloader/MethodImpl/generics_override1.il b/src/tests/Loader/classloader/MethodImpl/generics_override1.il index 88de948ec10..124747ba9a3 100644 --- a/src/tests/Loader/classloader/MethodImpl/generics_override1.il +++ b/src/tests/Loader/classloader/MethodImpl/generics_override1.il @@ -4,7 +4,7 @@ // This test covers the scenario of testing overrides of generic methods // 1. Test1 covers testing cases where a MethodImpl Decl could // resolve to 2 different methods and the exact signature is needed to represent -// which method is overriden. +// which method is overridden. // 2. Test2 covers testing the substitution chain handling scenario. // Metadata version: v4.0.30319 @@ -16,12 +16,12 @@ .assembly extern xunit.core {} .assembly 'generics_override1' { - .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) + .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows. // --- The following custom attribute is added automatically, do not uncomment ------- - // .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 ) + // .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 ) .hash algorithm 0x00008004 .ver 0:0:0:0 @@ -40,7 +40,7 @@ .class private abstract auto ansi beforefieldinit Base`2<T,U> extends [mscorlib]System.Object { - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method([out] class [mscorlib]System.Collections.Generic.List`1<!U>& y, class [mscorlib]System.Collections.Generic.List`1<!T>& x) cil managed { @@ -54,7 +54,7 @@ IL_000f: ret } // end of method Base`2::Method - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method(class [mscorlib]System.Collections.Generic.List`1<!T>& x, [out] class [mscorlib]System.Collections.Generic.List`1<!U>& y) cil managed { @@ -68,7 +68,7 @@ IL_000f: ret } // end of method Base`2::Method - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method(class [mscorlib]System.Collections.Generic.List`1<!U>& x) cil managed { // Code size 13 (0xd) @@ -78,7 +78,7 @@ IL_000c: ret } // end of method Base`2::Method - .method family hidebysig specialname rtspecialname + .method family hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -94,7 +94,7 @@ .class private auto ansi beforefieldinit Base2`2<A,B> extends class Base`2<!A,!B> { - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method([out] class [mscorlib]System.Collections.Generic.List`1<!A>& x) cil managed { // Code size 16 (0x10) @@ -107,7 +107,7 @@ IL_000f: ret } // end of method Base2`2::Method - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -123,7 +123,7 @@ .class private auto ansi beforefieldinit Derived extends class Base2`2<int32,int32> { - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method(class [mscorlib]System.Collections.Generic.List`1<int32>& a, [out] class [mscorlib]System.Collections.Generic.List`1<int32>& b) cil managed { @@ -139,7 +139,7 @@ IL_000f: ret } // end of method Derived::Method - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method(class [mscorlib]System.Collections.Generic.List`1<int32>& a) cil managed { .override method instance string class Base`2<int32,int32>::Method(class [mscorlib]System.Collections.Generic.List`1<!1>&) @@ -150,7 +150,7 @@ IL_000c: ret } // end of method Derived::Method - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -168,7 +168,7 @@ .class private auto ansi beforefieldinit BaseTestGenericsShape`4<A,B,C,D> extends [mscorlib]System.Object { - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method(!A a, !B b) cil managed { @@ -184,7 +184,7 @@ IL_000a: ret } // end of method BaseTestGenericsShape`4::Method - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance string Method(!C c, !D d) cil managed { @@ -200,7 +200,7 @@ IL_000a: ret } // end of method BaseTestGenericsShape`4::Method - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -216,7 +216,7 @@ .class private auto ansi beforefieldinit IntermediateGenericsShape`2<E,F> extends class BaseTestGenericsShape`4<object,string,!E,!F> { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -232,7 +232,7 @@ .class private auto ansi beforefieldinit DerivedGenericsShape`1<G> extends class IntermediateGenericsShape`2<int32,!G> { - .method public hidebysig virtual instance string + .method public hidebysig virtual instance string MethodOnDerived(int32 e, !G f) cil managed { @@ -249,7 +249,7 @@ IL_000a: ret } // end of method DerivedGenericsShape`1::Method - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -265,7 +265,7 @@ .class private auto ansi beforefieldinit DerivedGenericsShapeInvalidSubstitutedOverride extends class IntermediateGenericsShape`2<int32,int32> { - .method public hidebysig virtual instance string + .method public hidebysig virtual instance string MethodOnDerived(int32 e, int32 f) cil managed { @@ -282,7 +282,7 @@ IL_000a: ret } // end of method DerivedGenericsShapeInvalidSubstitutedOverride::Method - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -299,13 +299,13 @@ // Types for Test4 .class interface private abstract auto ansi IMultiGeneric`2<T,U> { - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance string Func(!T t1, !U u2) cil managed { } // end of method IMultiGeneric`2::Func - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance string Func(!U u1, !T t2) cil managed { @@ -317,7 +317,7 @@ extends [mscorlib]System.Object implements class IMultiGeneric`2<!A,!B> { - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'IMultiGeneric<A,B>.Func'(!A t1, !B u2) cil managed { @@ -336,7 +336,7 @@ IL_000a: ret } // end of method Implementor`2::'IMultiGeneric<A,B>.Func' - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'IMultiGeneric<A,B>.Func'(!B u1, !A t2) cil managed { @@ -355,7 +355,7 @@ IL_000a: ret } // end of method Implementor`2::'IMultiGeneric<A,B>.Func' - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -372,7 +372,7 @@ extends [mscorlib]System.Object implements class IMultiGeneric`2<!C,int32> { - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'IMultiGeneric<C,System.Int32>.Func'(!C t1, int32 u2) cil managed { @@ -391,7 +391,7 @@ IL_000a: ret } // end of method PartialIntImplementor`1::'IMultiGeneric<C,System.Int32>.Func' - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'IMultiGeneric<C,System.Int32>.Func'(int32 u1, !C t2) cil managed { @@ -410,7 +410,7 @@ IL_000a: ret } // end of method PartialIntImplementor`1::'IMultiGeneric<C,System.Int32>.Func' - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -427,7 +427,7 @@ extends [mscorlib]System.Object implements class IMultiGeneric`2<int32,int32> { - .method public hidebysig newslot virtual final + .method public hidebysig newslot virtual final instance string Func(int32 x, int32 y) cil managed { @@ -443,7 +443,7 @@ IL_000a: ret } // end of method IntImplementor::Func - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'IMultiGeneric<System.Int32,System.Int32>.Func(!0,!1)'(int32 u1, int32 t2) cil managed { @@ -461,7 +461,7 @@ IL_000a: ret } // end of method IntImplementor::'IMultiGeneric<System.Int32,System.Int32>.Func(!0,!1)' - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'IMultiGeneric<System.Int32,System.Int32>.Func(!1,!0)'(int32 u1, int32 t2) cil managed { @@ -479,7 +479,7 @@ IL_000a: ret } // end of method IntImplementor::'IMultiGeneric<System.Int32,System.Int32>.Func(!1,!0)' - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -495,7 +495,7 @@ // Types for Test5 .class interface private abstract auto ansi ISingleGeneric`1<T> { - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance string Method(!T t) cil managed { } // end of method ISingleGeneric`1::Method @@ -506,7 +506,7 @@ extends [mscorlib]System.Object implements class ISingleGeneric`1<int32> { - .method private hidebysig newslot virtual final + .method private hidebysig newslot virtual final instance string 'ISingleGeneric<System.Int32>.Method'(int32 t) cil managed { .override method instance string class ISingleGeneric`1<int32>::Method(int32) @@ -522,7 +522,7 @@ IL_000a: ret } // end of method InvalidOverride::'ISingleGeneric<System.Int32>.Method' - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) @@ -799,7 +799,7 @@ IL_0015: stloc.0 IL_0016: leave.s IL_003c } // end .try - catch [mscorlib]System.MissingMethodException + catch [mscorlib]System.MissingMethodException { IL_0018: pop IL_0019: nop @@ -810,7 +810,7 @@ IL_0027: stloc.0 IL_0028: leave.s IL_003c } // end handler - catch [mscorlib]System.TypeLoadException + catch [mscorlib]System.TypeLoadException { IL_002a: pop IL_002b: nop @@ -860,7 +860,7 @@ IL_0024: ret } // end of method Program::CallSpecificInterfaceFuncs - .method private hidebysig static int32 + .method private hidebysig static int32 Test4() cil managed { // Code size 120 (0x78) @@ -956,7 +956,7 @@ IL_001d: ret } // end of method Program::Test5Internal - .method private hidebysig static int32 + .method private hidebysig static int32 Test5() cil managed { // Code size 55 (0x37) @@ -985,7 +985,7 @@ IL_0036: stloc.0 IL_0037: leave.s IL_005d } // end .try - catch [mscorlib]System.MissingMethodException + catch [mscorlib]System.MissingMethodException { IL_0039: pop IL_003a: nop @@ -996,7 +996,7 @@ IL_0048: stloc.0 IL_0049: leave.s IL_005d } // end handler - catch [mscorlib]System.TypeLoadException + catch [mscorlib]System.TypeLoadException { IL_004b: pop IL_004c: nop @@ -1057,7 +1057,7 @@ IL_001d: nop IL_001e: leave.s IL_0035 } // end .try - catch [mscorlib]System.Exception + catch [mscorlib]System.Exception { IL_0020: stloc.3 IL_0021: nop @@ -1095,7 +1095,7 @@ IL_0052: nop IL_0053: leave.s IL_006c } // end .try - catch [mscorlib]System.Exception + catch [mscorlib]System.Exception { IL_0055: stloc.s V_5 IL_0057: nop @@ -1133,7 +1133,7 @@ IL_0089: nop IL_008a: leave.s IL_00a3 } // end .try - catch [mscorlib]System.Exception + catch [mscorlib]System.Exception { IL_008c: stloc.s V_7 IL_008e: nop @@ -1171,7 +1171,7 @@ Test4Done: nop leave.s Test4PostTryCatch } // end .try - catch [mscorlib]System.Exception + catch [mscorlib]System.Exception { stloc.s V_10 nop @@ -1210,7 +1210,7 @@ Test5Done: nop leave.s Test5PostTryCatch } // end .try - catch [mscorlib]System.Exception + catch [mscorlib]System.Exception { stloc.s V_12 nop @@ -1235,7 +1235,7 @@ IL_00ad: ret } // end of method Program::Main - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 8 (0x8) diff --git a/src/tests/Loader/classloader/MethodImpl/override_override1.il b/src/tests/Loader/classloader/MethodImpl/override_override1.il index 8b92de84911..36c41d1bbf4 100644 --- a/src/tests/Loader/classloader/MethodImpl/override_override1.il +++ b/src/tests/Loader/classloader/MethodImpl/override_override1.il @@ -7,14 +7,14 @@ // MyBar is a normal reference type that extends MyFoo. // MyBar::DoBar explicitly overrides MyFoo::DoFoo // MyBar::DoBarOverride explicitly overrides MyBar::DoBar -// Expect TypeLoadException when loading MyBar because on override is being overriden. +// Expect TypeLoadException when loading MyBar because on override is being overridden. .assembly extern mscorlib{} .assembly override_override1{} .class public auto ansi beforefieldinit MyFoo{ - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) @@ -36,7 +36,7 @@ .class public auto ansi beforefieldinit MyBar extends MyFoo { - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 DoBar() { .maxstack 1 @@ -53,7 +53,7 @@ } // end of method MyBar::DoBar - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 DoBarOverride() { // Code size 16 (0x10) @@ -71,7 +71,7 @@ } - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) @@ -119,10 +119,10 @@ call void [System.Console]System.Console::WriteLine(string) leave.s L1 } - catch [mscorlib]System.TypeLoadException{ + catch [mscorlib]System.TypeLoadException{ ldstr "Caught expected TypeLoadException:" call void [System.Console]System.Console::WriteLine(string) - call void [System.Console]System.Console::WriteLine(object) + call void [System.Console]System.Console::WriteLine(object) leave.s L1 } @@ -146,7 +146,7 @@ IL_002a: ret } // end of method CMain::Main - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) diff --git a/src/tests/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.il b/src/tests/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.il index cb456154ae0..47bbd28b720 100644 --- a/src/tests/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.il +++ b/src/tests/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.il @@ -7,7 +7,7 @@ // The reason we are using IL is because C# doesn't allow struct to have virtual methods with 'virtual' keyword. // Methods that implement interface methods are by default virtual (which translates to 'virtual newslot final' in IL. // But if we use 'virtual' keyword in C# it translates to 'virtual newslot' in IL -// and struct virtual methods can't be overriden. +// and struct virtual methods can't be overridden. .assembly extern mscorlib {} @@ -17,7 +17,7 @@ .class public auto ansi beforefieldinit A`1<T> extends [mscorlib]System.Object { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) @@ -38,12 +38,12 @@ .class interface public abstract auto ansi I { - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance int32 method1() cil managed { } // end of method I::method1 - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance int32 method2<T>() cil managed { } // end of method I::method2 @@ -52,12 +52,12 @@ .class interface public abstract auto ansi IGen`1<T> { - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance int32 method1() cil managed { } // end of method IGen`1::method1 - .method public hidebysig newslot abstract virtual + .method public hidebysig newslot abstract virtual instance int32 method2<M>() cil managed { } // end of method IGen`1::method2 @@ -85,7 +85,7 @@ IL_0006: ret } // end of method C1::method1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method2<T>() cil managed { // Code size 7 (0x7) @@ -146,7 +146,7 @@ { .pack 0 .size 1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method1() cil managed { // Code size 7 (0x7) @@ -161,7 +161,7 @@ IL_0006: ret } // end of method C3Int::method1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method2<U>() cil managed { // Code size 7 (0x7) @@ -199,7 +199,7 @@ IL_0006: ret } // end of method C3String::method1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method2<U>() cil managed { // Code size 7 (0x7) @@ -222,7 +222,7 @@ { .pack 0 .size 1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method1() cil managed { // Code size 7 (0x7) @@ -237,7 +237,7 @@ IL_0006: ret } // end of method C3Object::method1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method2<U>() cil managed { // Code size 7 (0x7) @@ -260,7 +260,7 @@ { .pack 0 .size 1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method1() cil managed { // Code size 7 (0x7) @@ -275,7 +275,7 @@ IL_0006: ret } // end of method C4`1::method1 - .method public hidebysig newslot virtual + .method public hidebysig newslot virtual instance int32 method2<U>() cil managed { // Code size 7 (0x7) @@ -840,7 +840,7 @@ IL_0048: ret } // end of method Test::Main - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) @@ -850,7 +850,7 @@ IL_0006: ret } // end of method Test::.ctor - .method private hidebysig specialname rtspecialname static + .method private hidebysig specialname rtspecialname static void .cctor() cil managed { // Code size 7 (0x7) diff --git a/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride.cs b/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride.cs index 364f05ba453..98cac403635 100644 --- a/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride.cs +++ b/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride.cs @@ -4,7 +4,7 @@ // this is regression test for VSW 395780 // explicit overriding with a generic type was working. -// as opposed to testExcplicitOverride2.il, in this case the overriden method is also generic. +// as opposed to testExcplicitOverride2.il, in this case the overridden method is also generic. using System; @@ -30,7 +30,7 @@ public class Test_testExplicitOverride try { I<String> cGen = new C(); - + int ret = cGen.M<String>("Hello"); if (ret == 3) @@ -49,6 +49,6 @@ public class Test_testExplicitOverride Console.WriteLine("FAIL: Caugh unexpected exception: " + e); return 101; } - + } } diff --git a/src/tests/Loader/classloader/regressions/dev10_813331/Case2.cs b/src/tests/Loader/classloader/regressions/dev10_813331/Case2.cs index 24331ca680c..e2b40ffd10c 100644 --- a/src/tests/Loader/classloader/regressions/dev10_813331/Case2.cs +++ b/src/tests/Loader/classloader/regressions/dev10_813331/Case2.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -//Non-generic classe A and generic class B +//Non-generic class A and generic class B public class HelloWorld { diff --git a/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il b/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il index 13fa000c3be..dca8b687dfb 100644 --- a/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il +++ b/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il @@ -16,9 +16,9 @@ // --- The following custom attribute is added automatically, do not uncomment ------- // .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool, - // bool) = ( 01 00 00 01 00 00 ) + // bool) = ( 01 00 00 01 00 00 ) - .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) + .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) .hash algorithm 0x00008004 .ver 0:0:0:0 } @@ -36,7 +36,7 @@ .class sealed private auto ansi beforefieldinit C<([mscorlib]System.Object) T> extends [mscorlib]System.ValueType { - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 75 (0x4b) @@ -86,7 +86,7 @@ IL_0017: ret } // end of method Test::fail - .method private hidebysig static int32 + .method private hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( @@ -113,7 +113,7 @@ IL_001d: callvirt instance void [mscorlib]System.Array::Initialize() IL_0022: ldsfld bool Test_vsw188290::run IL_0027: brtrue.s IL_0033 - IL_0029: ldstr "contructor not run" + IL_0029: ldstr "constructor not run" IL_002e: call void Test_vsw188290::fail(string) @@ -133,7 +133,7 @@ IL_0055: ldsfld bool Test_vsw188290::run IL_005a: brtrue.s IL_0066 - IL_005c: ldstr "contructor not run" + IL_005c: ldstr "constructor not run" IL_0061: call void Test_vsw188290::fail(string) IL_0066: ldstr "C<string> passed" call void [System.Console]System.Console::WriteLine(string) @@ -150,7 +150,7 @@ IL_0088: ldsfld bool Test_vsw188290::run IL_008d: brtrue.s IL_0099 - IL_008f: ldstr "contructor not run" + IL_008f: ldstr "constructor not run" IL_0094: call void Test_vsw188290::fail(string) IL_0099: ldstr "C<string[]> passed" call void [System.Console]System.Console::WriteLine(string) @@ -167,7 +167,7 @@ IL_00bb: ldsfld bool Test_vsw188290::run IL_00c0: brtrue.s IL_00cc - IL_00c2: ldstr "contructor not run" + IL_00c2: ldstr "constructor not run" IL_00c7: call void Test_vsw188290::fail(string) IL_00cc: ldstr "C<object> passed" call void [System.Console]System.Console::WriteLine(string) @@ -191,7 +191,7 @@ IL_00f6: ret } // end of method Test::Main - .method private hidebysig specialname rtspecialname static + .method private hidebysig specialname rtspecialname static void .cctor() cil managed { // Code size 7 (0x7) @@ -201,7 +201,7 @@ IL_0006: ret } // end of method Test::.cctor - .method public hidebysig specialname rtspecialname + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { // Code size 7 (0x7) diff --git a/src/tests/Loader/classloader/rmv/il/RMV-2-13-26-two.il b/src/tests/Loader/classloader/rmv/il/RMV-2-13-26-two.il index 173bce4e151..e759509e162 100644 --- a/src/tests/Loader/classloader/rmv/il/RMV-2-13-26-two.il +++ b/src/tests/Loader/classloader/rmv/il/RMV-2-13-26-two.il @@ -12,7 +12,7 @@ .assembly extern mscorlib {} .class value sealed Foo extends [mscorlib]System.ValueType{ - .method public pinvokeimpl("NonExistant.dll") void Foo(){ + .method public pinvokeimpl("NonExistent.dll") void Foo(){ } } |