revert layout change (#720)

* Revert "Refactor AddLayoutInfo"

This reverts commit 6070fe7.

* Revert "Add a ClassLayoutTable row for structs with no instance fields"

This reverts commit 8f2b917.

Author: mrvoorhe

Mono.Cecil/AssemblyWriter.cs

@@ -1435,7 +1435,8 @@ void AddType (TypeDefinition type)
 			if (type.HasInterfaces)
 				AddInterfaces (type);
 
-			AddLayoutInfo (type);
+			if (type.HasLayoutInfo)
+				AddLayoutInfo (type);
 
 			if (type.HasFields)
 				AddFields (type);
@@ -1554,36 +1555,12 @@ void AddInterfaces (TypeDefinition type)
 
 		void AddLayoutInfo (TypeDefinition type)
 		{
-			if (type.HasLayoutInfo) {
-				var table = GetTable<ClassLayoutTable> (Table.ClassLayout);
+			var table = GetTable<ClassLayoutTable> (Table.ClassLayout);
 
-				table.AddRow (new ClassLayoutRow (
-					(ushort) type.PackingSize,
-					(uint) type.ClassSize,
-					type.token.RID));
-
-				return;
-			}
-
-			if (type.IsValueType && HasNoInstanceField (type)) {
-				var table = GetTable<ClassLayoutTable> (Table.ClassLayout);
-
-				table.AddRow (new ClassLayoutRow (0, 1, type.token.RID));
-			}
-		}
-
-		static bool HasNoInstanceField (TypeDefinition type)
-		{
-			if (!type.HasFields)
-				return true;
-
-			var fields = type.Fields;
-
-			for (int i = 0; i < fields.Count; i++)
-				if (!fields [i].IsStatic)
-					return false;
-
-			return true;
+			table.AddRow (new ClassLayoutRow (
+				(ushort) type.PackingSize,
+				(uint) type.ClassSize,
+				type.token.RID));
 		}
 
 		void AddNestedTypes (TypeDefinition type)

Test/Mono.Cecil.Tests/TypeTests.cs

@@ -30,19 +30,6 @@ public void TypeLayout ()
 			});
 		}
 
-		[Test]
-		public void EmptyStructLayout ()
-		{
-			TestModule ("hello.exe", module =>
-			{
-				var foo = new TypeDefinition ("", "Foo",
-					TypeAttributes.Sealed | TypeAttributes.BeforeFieldInit | TypeAttributes.SequentialLayout,
-					module.ImportReference (typeof (ValueType))) ;
-
-				module.Types.Add (foo) ;
-			}) ;
-		}
-
 		[Test]
 		public void SimpleInterfaces ()
 		{