diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
commit | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (patch) | |
tree | e5435159cd1bf0519276363a6fe1663d1721bed3 /tests/src/Loader/classloader | |
parent | 4b4aad7217d3292650e77eec2cf4c198ea9c3b4b (diff) | |
download | coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.gz coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.bz2 coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.zip |
Imported Upstream version 1.0.0.9127upstream/1.0.0.9127
Diffstat (limited to 'tests/src/Loader/classloader')
41 files changed, 547 insertions, 279 deletions
diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase0.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase0.il index 1dcd41e7ee..f8721456a2 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase0.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase0.il @@ -36,7 +36,10 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -59,12 +62,20 @@ .maxstack 8 ldstr "B::Bar2" ret - } .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -103,4 +114,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase1.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase1.il index 371ade9c79..05c6c998a5 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase1.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase1.il @@ -24,7 +24,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase2.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase2.il index 3c65974a39..6cf4e13278 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase2.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase2.il @@ -24,7 +24,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase3.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase3.il index 9fc5e8128f..d41d8cb293 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase3.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase3.il @@ -19,7 +19,10 @@ .class interface nested family abstract auto ansi I`1<T> { .method public hidebysig newslot abstract virtual instance string Foo() cil managed {} } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase4.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase4.il index 137cf43079..bbd564bc62 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase4.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase4.il @@ -18,8 +18,11 @@ { .class interface nested family abstract auto ansi I`1<T> { .method public hidebysig newslot abstract virtual instance string Foo() cil managed {} } - - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase5.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase5.il index 3ff9b9ad2f..1cb5217e41 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase5.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase5.il @@ -36,19 +36,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class A`1/I`1<!W>, J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase6.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase6.il index 55a59a1084..7c08f9c345 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase6.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I/TestCase6.il @@ -36,19 +36,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class A`1/I`1<!W>, J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase0.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase0.il index 1bb1dae67b..490c829727 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase0.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase0.il @@ -36,7 +36,10 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -59,12 +62,20 @@ .maxstack 8 ldstr "B::Bar2" ret - } .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -103,4 +114,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase1.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase1.il index 7c099e229e..5501eb4f4c 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase1.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase1.il @@ -24,7 +24,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase2.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase2.il index f2c3c2f771..900afd1fe8 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase2.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase2.il @@ -24,7 +24,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase3.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase3.il index ea83a0f390..d8a6ded6f7 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase3.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase3.il @@ -19,7 +19,10 @@ .method public hidebysig newslot abstract virtual instance string Bar2() cil managed {} } } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase4.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase4.il index b95f00d0e5..14fe4646d4 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase4.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase4.il @@ -19,7 +19,10 @@ .method public hidebysig newslot abstract virtual instance string Bar2() cil managed {} } } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -43,12 +46,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -87,4 +97,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase5.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase5.il index 46b6c3a8e2..03ff440d1b 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase5.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase5.il @@ -36,18 +36,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class A`1/I`1<!W>, A`1/I`1/J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object @@ -87,4 +98,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase6.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase6.il index 365a6aa8aa..bdc70e8d42 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase6.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_I_Nested_J/TestCase6.il @@ -36,19 +36,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class A`1/I`1<!W>, A`1/I`1/J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase0.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase0.il index 356cd39010..d4aecd808a 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase0.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase0.il @@ -36,7 +36,10 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -59,12 +62,20 @@ .maxstack 8 ldstr "B::Bar2" ret - } .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -103,4 +114,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase1.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase1.il index bcf1b2b0d9..f24aba9bf1 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase1.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase1.il @@ -23,7 +23,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -42,12 +45,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -86,4 +96,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase2.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase2.il index 0d82b78ce3..eda666b305 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase2.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase2.il @@ -23,7 +23,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -42,12 +45,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -86,4 +96,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase3.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase3.il index 7341902b62..e15e0abb08 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase3.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase3.il @@ -18,7 +18,10 @@ .method public hidebysig newslot abstract virtual instance string Bar1() cil managed {} .method public hidebysig newslot abstract virtual instance string Bar2() cil managed {} } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -42,12 +45,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -86,4 +96,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase4.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase4.il index 75ef0e80cb..91ed35840a 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase4.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase4.il @@ -18,7 +18,10 @@ .method public hidebysig newslot abstract virtual instance string Bar1() cil managed {} .method public hidebysig newslot abstract virtual instance string Bar2() cil managed {} } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -42,12 +45,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -86,4 +96,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase5.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase5.il index 4e7a639528..1ceb777800 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase5.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase5.il @@ -35,19 +35,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class I`1<!W>, A`1/J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -86,4 +96,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase6.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase6.il index f106b5fc72..52d4631c63 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase6.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J/TestCase6.il @@ -35,19 +35,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class I`1<!W>, A`1/J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -86,4 +96,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase0.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase0.il index fb4f32d808..5fab5b8d0a 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase0.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase0.il @@ -34,7 +34,10 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -57,12 +60,20 @@ .maxstack 8 ldstr "B::Bar2" ret - } .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -101,4 +112,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase1.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase1.il index fd46e20202..d2a73e3020 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase1.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase1.il @@ -22,7 +22,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -41,12 +44,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -85,4 +95,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase2.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase2.il index 065c132353..6874dca76c 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase2.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase2.il @@ -22,7 +22,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -41,12 +44,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -85,4 +95,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase3.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase3.il index 7f40457ab5..03516e4494 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase3.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase3.il @@ -17,7 +17,10 @@ .method public hidebysig newslot abstract virtual instance string Bar1() cil managed {} .method public hidebysig newslot abstract virtual instance string Bar2() cil managed {} } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -41,12 +44,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -85,4 +95,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase4.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase4.il index f4efdfd2a3..72b3ed1e62 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase4.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase4.il @@ -17,7 +17,10 @@ .method public hidebysig newslot abstract virtual instance string Bar1() cil managed {} .method public hidebysig newslot abstract virtual instance string Bar2() cil managed {} } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -41,12 +44,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -85,4 +95,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase5.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase5.il index a446ed32df..0fb52a5c62 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase5.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase5.il @@ -34,19 +34,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class A`1/J/I`1<!W>, A`1/J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -85,4 +95,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase6.il b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase6.il index baaabcccdb..fd5047eaf3 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase6.il +++ b/tests/src/Loader/classloader/InterfaceFolding/Nested_J_Nested_I/TestCase6.il @@ -34,19 +34,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class A`1/J/I`1<!W>, A`1/J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { @@ -85,4 +95,4 @@ FAILURE: ldc.i4.m1 ret } -}
\ No newline at end of file +} diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase0.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase0.il index 0e5c131773..068a309944 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase0.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase0.il @@ -37,7 +37,10 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -60,12 +63,16 @@ .maxstack 8 ldstr "B::Bar2" ret - } .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase1.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase1.il index 2f7be47be0..e5d41839f8 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase1.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase1.il @@ -25,7 +25,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -44,12 +47,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase2.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase2.il index 1927d596ae..30e99dca24 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase2.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase2.il @@ -25,7 +25,10 @@ ldstr "A::Foo" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -44,12 +47,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase3.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase3.il index e67f03912c..d84965ce38 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase3.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase3.il @@ -20,7 +20,10 @@ .class private abstract auto ansi beforefieldinit A`1<U> implements class I`1<!U> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -44,12 +47,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase4.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase4.il index e411d7a588..f41de5c05d 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase4.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase4.il @@ -20,7 +20,10 @@ .class private abstract auto ansi beforefieldinit A`1<U> implements class I`1<!U> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> @@ -44,12 +47,19 @@ ldstr "B::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase5.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase5.il index 30a61c9a08..51ddd83515 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase5.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase5.il @@ -37,19 +37,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class I`1<!W>, J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase6.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase6.il index 4b9dc2ceea..ceba5455b2 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase6.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase6.il @@ -37,19 +37,29 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private abstract auto ansi beforefieldinit B`2<V,W> extends class A`1<!V> implements class I`1<!W>, J { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase7.il b/tests/src/Loader/classloader/InterfaceFolding/TestCase7.il index 92f61358d3..2513ae09a0 100644 --- a/tests/src/Loader/classloader/InterfaceFolding/TestCase7.il +++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase7.il @@ -37,7 +37,10 @@ ldstr "A::Bar2" ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit B`2<V,W> @@ -61,12 +64,20 @@ .maxstack 8 ldstr "B::Bar2" ret - } .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} + } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class private auto ansi beforefieldinit C extends class B`2<class C,class C> -{ .method public hidebysig specialname rtspecialname instance void .ctor() cil managed {} } - +{ + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } +} .class public auto ansi beforefieldinit Test extends [mscorlib]System.Object { diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.csproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.csproj deleted file mode 100644 index 5c75304b16..0000000000 --- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.csproj +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyName>Test2_NonFriendPriInterface</AssemblyName> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib> - <OutputType>Library</OutputType> - <CLRTestKind>BuildOnly</CLRTestKind> - <CLRTestPriority>0</CLRTestPriority> - </PropertyGroup> - - <ItemGroup> - <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> - <Visible>False</Visible> - </CodeAnalysisDependentAssemblyPaths> - </ItemGroup> - - <ItemGroup> - <Compile Include="Test2_NonFriendPriInterface.cs" /> - </ItemGroup> - - - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/tests/src/Loader/classloader/generics/Visibility/A_Types.csproj b/tests/src/Loader/classloader/generics/Visibility/A_Types.csproj deleted file mode 100644 index 023d1b9c98..0000000000 --- a/tests/src/Loader/classloader/generics/Visibility/A_Types.csproj +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyName>A_Types</AssemblyName> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib> - <OutputType>Library</OutputType> - <CLRTestKind>BuildOnly</CLRTestKind> - <CLRTestPriority>0</CLRTestPriority> - </PropertyGroup> - - <ItemGroup> - <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> - <Visible>False</Visible> - </CodeAnalysisDependentAssemblyPaths> - </ItemGroup> - - <ItemGroup> - <Compile Include="A_Types.cs" /> - </ItemGroup> - - - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/tests/src/Loader/classloader/generics/Visibility/B_Types.csproj b/tests/src/Loader/classloader/generics/Visibility/B_Types.csproj deleted file mode 100644 index 46c06016fe..0000000000 --- a/tests/src/Loader/classloader/generics/Visibility/B_Types.csproj +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyName>B_Types</AssemblyName> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib> - <OutputType>Library</OutputType> - <CLRTestKind>BuildOnly</CLRTestKind> - <CLRTestPriority>0</CLRTestPriority> - </PropertyGroup> - - <ItemGroup> - <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> - <Visible>False</Visible> - </CodeAnalysisDependentAssemblyPaths> - </ItemGroup> - - <ItemGroup> - <Compile Include="B_Types.cs" /> - </ItemGroup> - - - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj index ce7ca5e3fa..29cb737ea5 100644 --- a/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj +++ b/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj @@ -15,6 +15,7 @@ <OutputType>Exe</OutputType> <CLRTestKind>BuildAndRun</CLRTestKind> <CLRTestPriority>0</CLRTestPriority> + <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible> </PropertyGroup> <ItemGroup> diff --git a/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.il b/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.il index babb30d572..96e28f672f 100644 --- a/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.il +++ b/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.il @@ -21,12 +21,18 @@ The bug related to populating MethodDesc slots in generic dictionaries at runtim .class public DerivedDerived extends class Derived`2<string,string> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class public Derived`2<T0, T1> extends class Base`2<int32,!T1> { - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } .class public Base`2<T0, T1> { @@ -40,7 +46,10 @@ The bug related to populating MethodDesc slots in generic dictionaries at runtim call string [mscorlib]System.String::Concat(object,object) ret } - .method public hidebysig specialname rtspecialname instance void .ctor() cil managed { } + .method public hidebysig specialname rtspecialname instance void .ctor() cil managed + { + ret + } } |