7 files changed, 106 insertions, 35 deletions
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
+}