Merge branch 'upstream' into tizen

Change-Id: I4400c6fae623c356170074871ee575b96a4af206

1 files changed, 16 insertions, 5 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
+}