From 743f37e2769f9e09895c4b158d8eadede0f83a82 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 22 Aug 2012 20:21:35 +0200
Subject: [PATCH] Fix #357: Update to new Mono.Cecil version.

New version: 9848dc65a5909a8722b807c1786dd8ec02750024 from threadsafe2 branch at jbevain/cecil.
---
 Mono.Cecil/Mono.Cecil.Cil/CodeReader.cs       |   4 +-
 Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs       |  16 ++-
 Mono.Cecil/Mono.Cecil.PE/Image.cs             |   2 +
 Mono.Cecil/Mono.Cecil.PE/ImageReader.cs       |  13 +-
 Mono.Cecil/Mono.Cecil.PE/ImageWriter.cs       | 114 +++++++++---------
 Mono.Cecil/Mono.Cecil.nuspec                  |   2 +-
 .../Mono.Cecil/AssemblyNameReference.cs       |  11 +-
 Mono.Cecil/Mono.Cecil/AssemblyReader.cs       |   8 +-
 Mono.Cecil/Mono.Cecil/AssemblyWriter.cs       |  14 +--
 .../Mono.Cecil/DefaultAssemblyResolver.cs     |   5 -
 Mono.Cecil/Mono.Cecil/IMethodSignature.cs     |   5 +
 Mono.Cecil/Mono.Cecil/Import.cs               |   2 +-
 Mono.Cecil/Mono.Cecil/MetadataSystem.cs       |  12 +-
 Mono.Cecil/Mono.Cecil/ModuleDefinition.cs     |  41 +++++--
 Mono.Cecil/Mono.Cecil/ModuleKind.cs           |  14 ++-
 Mono.Cecil/Mono.Cecil/ParameterDefinition.cs  |   2 +-
 Mono.Cecil/Mono.Cecil/TypeParser.cs           |   2 +-
 Mono.Cecil/Mono.Cecil/TypeSystem.cs           |  31 ++++-
 Mono.Cecil/Test/Mono.Cecil.Tests.csproj       |   1 +
 .../Test/Mono.Cecil.Tests/ImageReadTests.cs   |  25 ++++
 Mono.Cecil/Test/Mono.Cecil.Tests/TypeTests.cs |  15 +++
 .../Resources/assemblies/delay-signed.dll     | Bin 0 -> 3584 bytes
 .../Test/Resources/assemblies/metro.exe       | Bin 0 -> 15872 bytes
 Mono.Cecil/Test/Resources/assemblies/wp7.dll  | Bin 0 -> 10752 bytes
 Mono.Cecil/Test/Resources/il/explicitthis.il  | 113 +++++++++++++++++
 .../MonoSymbolFile.cs                         |   7 +-
 26 files changed, 347 insertions(+), 112 deletions(-)
 create mode 100644 Mono.Cecil/Test/Resources/assemblies/delay-signed.dll
 create mode 100644 Mono.Cecil/Test/Resources/assemblies/metro.exe
 create mode 100644 Mono.Cecil/Test/Resources/assemblies/wp7.dll
 create mode 100644 Mono.Cecil/Test/Resources/il/explicitthis.il

diff --git a/Mono.Cecil/Mono.Cecil.Cil/CodeReader.cs b/Mono.Cecil/Mono.Cecil.Cil/CodeReader.cs
index 4141617f1..12ca5a23b 100644
--- a/Mono.Cecil/Mono.Cecil.Cil/CodeReader.cs
+++ b/Mono.Cecil/Mono.Cecil.Cil/CodeReader.cs
@@ -102,7 +102,7 @@ namespace Mono.Cecil.Cil {
 				throw new InvalidOperationException ();
 			}
 
-			var symbol_reader = reader.module.SymbolReader;
+			var symbol_reader = reader.module.symbol_reader;
 
 			if (symbol_reader != null) {
 				var instructions = body.Instructions;
@@ -409,7 +409,7 @@ namespace Mono.Cecil.Cil {
 				throw new NotSupportedException ();
 			}
 
-			var symbol_reader = reader.module.SymbolReader;
+			var symbol_reader = reader.module.symbol_reader;
 			if (symbol_reader != null && writer.metadata.write_symbols) {
 				symbols.method_token = GetOriginalToken (writer.metadata, method);
 				symbols.local_var_token = local_var_token;
diff --git a/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs b/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs
index 02876aad5..ac093cae4 100644
--- a/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs
+++ b/Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs
@@ -424,10 +424,18 @@ namespace Mono.Cecil.Cil {
 			switch (instruction.opcode.FlowControl) {
 			case FlowControl.Call: {
 				var method = (IMethodSignature) instruction.operand;
-				stack_size -= (method.HasParameters ? method.Parameters.Count : 0)
-					+ (method.HasThis && instruction.opcode.Code != Code.Newobj ? 1 : 0);
-				stack_size += (method.ReturnType.etype == ElementType.Void ? 0 : 1)
-					+ (method.HasThis && instruction.opcode.Code == Code.Newobj ? 1 : 0);
+				// pop 'this' argument
+				if (method.HasImplicitThis() && instruction.opcode.Code != Code.Newobj)
+					stack_size--;
+				// pop normal arguments
+				if (method.HasParameters)
+					stack_size -= method.Parameters.Count;
+				// pop function pointer
+				if (instruction.opcode.Code == Code.Calli)
+					stack_size--;
+				// push return value
+				if (method.ReturnType.etype != ElementType.Void || instruction.opcode.Code == Code.Newobj)
+					stack_size++;
 				break;
 			}
 			default:
diff --git a/Mono.Cecil/Mono.Cecil.PE/Image.cs b/Mono.Cecil/Mono.Cecil.PE/Image.cs
index 9a04494f0..a11cf1c40 100644
--- a/Mono.Cecil/Mono.Cecil.PE/Image.cs
+++ b/Mono.Cecil/Mono.Cecil.PE/Image.cs
@@ -41,6 +41,7 @@ namespace Mono.Cecil.PE {
 		public ModuleKind Kind;
 		public TargetRuntime Runtime;
 		public TargetArchitecture Architecture;
+		public ModuleCharacteristics Characteristics;
 		public string FileName;
 
 		public Section [] Sections;
@@ -52,6 +53,7 @@ namespace Mono.Cecil.PE {
 
 		public DataDirectory Debug;
 		public DataDirectory Resources;
+		public DataDirectory StrongName;
 
 		public StringHeap StringHeap;
 		public BlobHeap BlobHeap;
diff --git a/Mono.Cecil/Mono.Cecil.PE/ImageReader.cs b/Mono.Cecil/Mono.Cecil.PE/ImageReader.cs
index 0714e7559..c96c1db31 100644
--- a/Mono.Cecil/Mono.Cecil.PE/ImageReader.cs
+++ b/Mono.Cecil/Mono.Cecil.PE/ImageReader.cs
@@ -99,13 +99,14 @@ namespace Mono.Cecil.PE {
 			// Characteristics		2
 			ushort characteristics = ReadUInt16 ();
 
-			ushort subsystem;
-			ReadOptionalHeaders (out subsystem);
+			ushort subsystem, dll_characteristics;
+			ReadOptionalHeaders (out subsystem, out dll_characteristics);
 			ReadSections (sections);
 			ReadCLIHeader ();
 			ReadMetadata ();
 
 			image.Kind = GetModuleKind (characteristics, subsystem);
+			image.Characteristics = (ModuleCharacteristics) dll_characteristics;
 		}
 
 		TargetArchitecture ReadArchitecture ()
@@ -122,7 +123,7 @@ namespace Mono.Cecil.PE {
 				return TargetArchitecture.ARMv7;
 			}
 
-			throw new NotSupportedException (machine.ToString());
+			throw new NotSupportedException ();
 		}
 
 		static ModuleKind GetModuleKind (ushort characteristics, ushort subsystem)
@@ -136,7 +137,7 @@ namespace Mono.Cecil.PE {
 			return ModuleKind.Console;
 		}
 
-		void ReadOptionalHeaders (out ushort subsystem)
+		void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics)
 		{
 			// - PEOptionalHeader
 			//   - StandardFieldsHeader
@@ -176,6 +177,7 @@ namespace Mono.Cecil.PE {
 			subsystem = ReadUInt16 ();
 
 			// DLLFlags				2
+			dll_characteristics = ReadUInt16 ();
 			// StackReserveSize		4 || 8
 			// StackCommitSize		4 || 8
 			// HeapReserveSize		4 || 8
@@ -192,7 +194,7 @@ namespace Mono.Cecil.PE {
 			// CertificateTable		8
 			// BaseRelocationTable	8
 
-			Advance (pe64 ? 90 : 74);
+			Advance (pe64 ? 88 : 72);
 
 			// Debug				8
 			image.Debug = ReadDataDirectory ();
@@ -322,6 +324,7 @@ namespace Mono.Cecil.PE {
 			// Resources				8
 			image.Resources = ReadDataDirectory ();
 			// StrongNameSignature		8
+			image.StrongName = ReadDataDirectory ();
 			// CodeManagerTable			8
 			// VTableFixups				8
 			// ExportAddressTableJumps	8
diff --git a/Mono.Cecil/Mono.Cecil.PE/ImageWriter.cs b/Mono.Cecil/Mono.Cecil.PE/ImageWriter.cs
index af6aa7a35..c62427c6a 100644
--- a/Mono.Cecil/Mono.Cecil.PE/ImageWriter.cs
+++ b/Mono.Cecil/Mono.Cecil.PE/ImageWriter.cs
@@ -75,7 +75,7 @@ namespace Mono.Cecil.PE {
 			this.GetDebugHeader ();
 			this.GetWin32Resources ();
 			this.text_map = BuildTextMap ();
-			this.sections = 2; // text + reloc
+			this.sections = (ushort) (pe64 ? 1 : 2); // text + reloc
 			this.time_stamp = (uint) DateTime.UtcNow.Subtract (new DateTime (1970, 1, 1)).TotalSeconds;
 		}
 
@@ -133,7 +133,8 @@ namespace Mono.Cecil.PE {
 				previous = rsrc;
 			}
 
-			reloc = CreateSection (".reloc", 12u, previous);
+			if (!pe64)
+				reloc = CreateSection (".reloc", 12u, previous);
 		}
 
 		Section CreateSection (string name, uint size, Section previous)
@@ -217,20 +218,29 @@ namespace Mono.Cecil.PE {
 			throw new NotSupportedException ();
 		}
 
+		Section LastSection ()
+		{
+			if (reloc != null)
+				return reloc;
+
+			if (rsrc != null)
+				return rsrc;
+
+			return text;
+		}
+
 		void WriteOptionalHeaders ()
 		{
 			WriteUInt16 ((ushort) (!pe64 ? 0x10b : 0x20b));	// Magic
 			WriteByte (8);	// LMajor
 			WriteByte (0);	// LMinor
 			WriteUInt32 (text.SizeOfRawData);	// CodeSize
-			WriteUInt32 (reloc.SizeOfRawData
+			WriteUInt32 ((reloc != null ? reloc.SizeOfRawData : 0)
 				+ (rsrc != null ? rsrc.SizeOfRawData : 0));	// InitializedDataSize
 			WriteUInt32 (0);	// UninitializedDataSize
 
-			var entry_point_rva = text_map.GetRVA (TextSegment.StartupStub);
-			if (module.Architecture == TargetArchitecture.IA64)
-				entry_point_rva += 0x20;
-			WriteUInt32 (entry_point_rva); // EntryPointRVA
+			var startub_stub = text_map.GetRange (TextSegment.StartupStub);
+			WriteUInt32 (startub_stub.Length > 0 ? startub_stub.Start : 0);  // EntryPointRVA
 			WriteUInt32 (text_rva);	// BaseOfCode
 
 			if (!pe64) {
@@ -251,12 +261,13 @@ namespace Mono.Cecil.PE {
 			WriteUInt16 (0);	// SubSysMinor
 			WriteUInt32 (0);	// Reserved
 
-			WriteUInt32 (reloc.VirtualAddress + Align (reloc.VirtualSize, section_alignment));	// ImageSize
+			var last_section = LastSection();
+			WriteUInt32 (last_section.VirtualAddress + Align (last_section.VirtualSize, section_alignment));	// ImageSize
 			WriteUInt32 (text.PointerToRawData);	// HeaderSize
 
 			WriteUInt32 (0);	// Checksum
 			WriteUInt16 (GetSubSystem ());	// SubSystem
-			WriteUInt16 (0x8540);	// DLLFlags
+			WriteUInt16 ((ushort) module.Characteristics);	// DLLFlags
 
 			const ulong stack_reserve = 0x100000;
 			const ulong stack_commit = 0x1000;
@@ -288,8 +299,8 @@ namespace Mono.Cecil.PE {
 
 			WriteZeroDataDirectory ();	// ExceptionTable
 			WriteZeroDataDirectory ();	// CertificateTable
-			WriteUInt32 (reloc.VirtualAddress);			// BaseRelocationTable
-			WriteUInt32 (reloc.VirtualSize);
+			WriteUInt32 (reloc != null ? reloc.VirtualAddress : 0);			// BaseRelocationTable
+			WriteUInt32 (reloc != null ? reloc.VirtualSize : 0);
 
 			if (text_map.GetLength (TextSegment.DebugDirectory) > 0) {
 				WriteUInt32 (text_map.GetRVA (TextSegment.DebugDirectory));
@@ -335,7 +346,8 @@ namespace Mono.Cecil.PE {
 			if (rsrc != null)
 				WriteSection (rsrc, 0x40000040);
 
-			WriteSection (reloc, 0x42000040);
+			if (reloc != null)
+				WriteSection (reloc, 0x42000040);
 		}
 
 		void WriteSection (Section section, uint characteristics)
@@ -386,8 +398,10 @@ namespace Mono.Cecil.PE {
 
 			// ImportAddressTable
 
-			WriteRVA (text_map.GetRVA (TextSegment.ImportHintNameTable));
-			WriteRVA (0);
+			if (!pe64) {
+				WriteRVA (text_map.GetRVA (TextSegment.ImportHintNameTable));
+				WriteRVA (0);
+			}
 
 			// CLIHeader
 
@@ -439,6 +453,9 @@ namespace Mono.Cecil.PE {
 				WriteDebugDirectory ();
 			}
 
+			if (pe64)
+				return;
+
 			// ImportDirectory
 			MoveToRVA (TextSegment.ImportDirectory);
 			WriteImportDirectory ();
@@ -605,19 +622,8 @@ namespace Mono.Cecil.PE {
 				WriteUInt16 (0x25ff);
 				WriteUInt32 ((uint) image_base + text_map.GetRVA (TextSegment.ImportAddressTable));
 				return;
-			case TargetArchitecture.AMD64:
-				WriteUInt16 (0xa148);
-				WriteUInt32 ((uint) image_base + text_map.GetRVA (TextSegment.ImportAddressTable));
-				WriteUInt16 (0xe0ff);
-				return;
-			case TargetArchitecture.IA64:
-				WriteBytes (new byte [] {
-					0x0b, 0x48, 0x00, 0x02, 0x18, 0x10, 0xa0, 0x40, 0x24, 0x30, 0x28, 0x00, 0x00, 0x00, 0x04, 0x00,
-					0x10, 0x08, 0x00, 0x12, 0x18, 0x10, 0x60, 0x50, 0x04, 0x80, 0x03, 0x00, 0x60, 0x00, 0x80, 0x00
-				});
-				WriteUInt32 ((uint) image_base + text_map.GetRVA (TextSegment.StartupStub));
-				WriteUInt32 ((uint) image_base + text_rva);
-				return;
+			default:
+				throw new NotSupportedException ();
 			}
 		}
 
@@ -642,13 +648,8 @@ namespace Mono.Cecil.PE {
 			case TargetArchitecture.I386:
 				WriteUInt32 (0x3000 + reloc_rva - page_rva);
 				break;
-			case TargetArchitecture.AMD64:
-				WriteUInt32 (0xa000 + reloc_rva - page_rva);
-				break;
-			case TargetArchitecture.IA64:
-				WriteUInt16 ((ushort) (0xa000 + reloc_rva - page_rva));
-				WriteUInt16 ((ushort) (0xa000 + reloc_rva - page_rva + 8));
-				break;
+			default:
+				throw new NotSupportedException();
 			}
 
 			WriteBytes (new byte [file_alignment - reloc.VirtualSize]);
@@ -663,7 +664,8 @@ namespace Mono.Cecil.PE {
 			WriteText ();
 			if (rsrc != null)
 				WriteRsrc ();
-			WriteReloc ();
+			if (reloc != null)
+				WriteReloc ();
 		}
 
 		TextMap BuildTextMap ()
@@ -694,8 +696,16 @@ namespace Mono.Cecil.PE {
 
 			map.AddMap (TextSegment.DebugDirectory, debug_dir_len, 4);
 
+			if (pe64) {
+				var start = map.GetNextRVA (TextSegment.DebugDirectory);
+				map.AddMap (TextSegment.ImportDirectory, new Range (start, 0));
+				map.AddMap (TextSegment.ImportHintNameTable, new Range (start, 0));
+				map.AddMap (TextSegment.StartupStub, new Range (start, 0));
+				return map;
+			}
+
 			RVA import_dir_rva = map.GetNextRVA (TextSegment.DebugDirectory);
-			RVA import_hnt_rva = import_dir_rva + (!pe64 ? 48u : 52u);
+			RVA import_hnt_rva = import_dir_rva + 48u;
 			import_hnt_rva = (import_hnt_rva + 15u) & ~15u;
 			uint import_dir_len = (import_hnt_rva - import_dir_rva) + 27u;
 
@@ -716,12 +726,8 @@ namespace Mono.Cecil.PE {
 			switch (module.Architecture) {
 			case TargetArchitecture.I386:
 				return 6;
-			case TargetArchitecture.AMD64:
-				return 12;
-			case TargetArchitecture.IA64:
-				return 48;
 			default:
-				throw new InvalidOperationException ();
+				throw new NotSupportedException ();
 			}
 		}
 
@@ -744,24 +750,22 @@ namespace Mono.Cecil.PE {
 
 		int GetStrongNameLength ()
 		{
-			if ((module.Attributes & ModuleAttributes.StrongNameSigned) == 0)
-				return 0;
-
 			if (module.Assembly == null)
-				throw new InvalidOperationException ();
+				return 0;
 
 			var public_key = module.Assembly.Name.PublicKey;
+			if (public_key.IsNullOrEmpty ())
+				return 0;
 
-			if (public_key != null) {
-				// in fx 2.0 the key may be from 384 to 16384 bits
-				// so we must calculate the signature size based on
-				// the size of the public key (minus the 32 byte header)
-				int size = public_key.Length;
-				if (size > 32)
-					return size - 32;
-				// note: size == 16 for the ECMA "key" which is replaced
-				// by the runtime with a 1024 bits key (128 bytes)
-			}
+			// in fx 2.0 the key may be from 384 to 16384 bits
+			// so we must calculate the signature size based on
+			// the size of the public key (minus the 32 byte header)
+			int size = public_key.Length;
+			if (size > 32)
+				return size - 32;
+
+			// note: size == 16 for the ECMA "key" which is replaced
+			// by the runtime with a 1024 bits key (128 bytes)
 
 			return 128; // default strongname signature size
 		}
diff --git a/Mono.Cecil/Mono.Cecil.nuspec b/Mono.Cecil/Mono.Cecil.nuspec
index 021e794e6..ffab04f49 100644
--- a/Mono.Cecil/Mono.Cecil.nuspec
+++ b/Mono.Cecil/Mono.Cecil.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Mono.Cecil</id>
-    <version>0.9.5.2</version>
+    <version>0.9.5.3</version>
     <title>Mono.Cecil</title>
     <authors>Jb Evain</authors>
     <owners>Jb Evain</owners>
diff --git a/Mono.Cecil/Mono.Cecil/AssemblyNameReference.cs b/Mono.Cecil/Mono.Cecil/AssemblyNameReference.cs
index 063bc5b62..a8ad42c3c 100644
--- a/Mono.Cecil/Mono.Cecil/AssemblyNameReference.cs
+++ b/Mono.Cecil/Mono.Cecil/AssemblyNameReference.cs
@@ -98,7 +98,7 @@ namespace Mono.Cecil {
 		}
 
 		public byte [] PublicKey {
-			get { return public_key; }
+			get { return public_key ?? Empty<byte>.Array; }
 			set {
 				public_key = value;
 				HasPublicKey = !public_key.IsNullOrEmpty ();
@@ -117,7 +117,7 @@ namespace Mono.Cecil {
 					Array.Reverse (local_public_key_token, 0, 8);
 					public_key_token = local_public_key_token; // publish only once finished (required for thread-safety)
 				}
-				return public_key_token;
+				return public_key_token ?? Empty<byte>.Array;
 			}
 			set {
 				public_key_token = value;
@@ -176,9 +176,10 @@ namespace Mono.Cecil {
 				builder.Append (sep);
 				builder.Append ("PublicKeyToken=");
 
-				if (this.PublicKeyToken != null && public_key_token.Length > 0) {
-					for (int i = 0 ; i < public_key_token.Length ; i++) {
-						builder.Append (public_key_token [i].ToString ("x2"));
+				var pk_token = PublicKeyToken;
+				if (!pk_token.IsNullOrEmpty () && pk_token.Length > 0) {
+					for (int i = 0 ; i < pk_token.Length ; i++) {
+						builder.Append (pk_token [i].ToString ("x2"));
 					}
 				} else
 					builder.Append ("null");
diff --git a/Mono.Cecil/Mono.Cecil/AssemblyReader.cs b/Mono.Cecil/Mono.Cecil/AssemblyReader.cs
index de296e789..00eba7437 100644
--- a/Mono.Cecil/Mono.Cecil/AssemblyReader.cs
+++ b/Mono.Cecil/Mono.Cecil/AssemblyReader.cs
@@ -778,8 +778,12 @@ namespace Mono.Cecil {
 
 			var nested_types = new MemberDefinitionCollection<TypeDefinition> (type, mapping.Length);
 
-			for (int i = 0; i < mapping.Length; i++)
-				nested_types.Add (GetTypeDefinition (mapping [i]));
+			for (int i = 0; i < mapping.Length; i++) {
+				var nested_type = GetTypeDefinition (mapping [i]);
+
+				if (nested_type != null)
+					nested_types.Add (nested_type);
+			}
 
 			metadata.RemoveNestedTypeMapping (type);
 
diff --git a/Mono.Cecil/Mono.Cecil/AssemblyWriter.cs b/Mono.Cecil/Mono.Cecil/AssemblyWriter.cs
index a2d3ffa41..bffa439c6 100644
--- a/Mono.Cecil/Mono.Cecil/AssemblyWriter.cs
+++ b/Mono.Cecil/Mono.Cecil/AssemblyWriter.cs
@@ -97,20 +97,18 @@ namespace Mono.Cecil {
 			var symbol_writer = GetSymbolWriter (module, fq_name, symbol_writer_provider);
 
 #if !SILVERLIGHT && !CF
-			if (parameters.StrongNameKeyPair != null && name != null)
+			if (parameters.StrongNameKeyPair != null && name != null) {
 				name.PublicKey = parameters.StrongNameKeyPair.PublicKey;
-#endif
-
-			if (name != null && name.HasPublicKey)
 				module.Attributes |= ModuleAttributes.StrongNameSigned;
-
+			}
+#endif
 			var metadata = new MetadataBuilder (module, fq_name,
 				symbol_writer_provider, symbol_writer);
 
 			BuildMetadata (module, metadata);
 
-			if (module.SymbolReader != null)
-				module.SymbolReader.Dispose ();
+			if (module.symbol_reader != null)
+				module.symbol_reader.Dispose ();
 
 			var writer = ImageWriter.CreateWriter (module, metadata, stream);
 
@@ -786,7 +784,7 @@ namespace Mono.Cecil {
 		TextMap CreateTextMap ()
 		{
 			var map = new TextMap ();
-			map.AddMap (TextSegment.ImportAddressTable, module.Architecture == TargetArchitecture.I386 ? 8 : 16);
+			map.AddMap (TextSegment.ImportAddressTable, module.Architecture == TargetArchitecture.I386 ? 8 : 0);
 			map.AddMap (TextSegment.CLIHeader, 0x48, 8);
 			return map;
 		}
diff --git a/Mono.Cecil/Mono.Cecil/DefaultAssemblyResolver.cs b/Mono.Cecil/Mono.Cecil/DefaultAssemblyResolver.cs
index a9faa2142..e0baedf77 100644
--- a/Mono.Cecil/Mono.Cecil/DefaultAssemblyResolver.cs
+++ b/Mono.Cecil/Mono.Cecil/DefaultAssemblyResolver.cs
@@ -31,11 +31,6 @@ using System.Collections.Generic;
 
 namespace Mono.Cecil {
 
-	public static class GlobalAssemblyResolver {
-
-		public static readonly IAssemblyResolver Instance = new DefaultAssemblyResolver ();
-	}
-
 	public class DefaultAssemblyResolver : BaseAssemblyResolver {
 
 		readonly IDictionary<string, AssemblyDefinition> cache;
diff --git a/Mono.Cecil/Mono.Cecil/IMethodSignature.cs b/Mono.Cecil/Mono.Cecil/IMethodSignature.cs
index 491deec5d..e3d288ba9 100644
--- a/Mono.Cecil/Mono.Cecil/IMethodSignature.cs
+++ b/Mono.Cecil/Mono.Cecil/IMethodSignature.cs
@@ -46,6 +46,11 @@ namespace Mono.Cecil {
 
 	static partial class Mixin {
 
+		public static bool HasImplicitThis (this IMethodSignature self)
+		{
+			return self.HasThis && !self.ExplicitThis;
+		}
+
 		public static void MethodSignatureFullName (this IMethodSignature self, StringBuilder builder)
 		{
 			builder.Append ("(");
diff --git a/Mono.Cecil/Mono.Cecil/Import.cs b/Mono.Cecil/Mono.Cecil/Import.cs
index 4f3ff25c4..38d012041 100644
--- a/Mono.Cecil/Mono.Cecil/Import.cs
+++ b/Mono.Cecil/Mono.Cecil/Import.cs
@@ -92,7 +92,7 @@ namespace Mono.Cecil {
 			if (IsNestedType (type))
 				reference.DeclaringType = ImportType (type.DeclaringType, context, import_kind);
 			else
-				reference.Namespace = type.Namespace;
+				reference.Namespace = type.Namespace ?? string.Empty;
 
 			if (type.IsGenericType)
 				ImportGenericParameters (reference, type.GetGenericArguments ());
diff --git a/Mono.Cecil/Mono.Cecil/MetadataSystem.cs b/Mono.Cecil/Mono.Cecil/MetadataSystem.cs
index d17a78386..72b04f285 100644
--- a/Mono.Cecil/Mono.Cecil/MetadataSystem.cs
+++ b/Mono.Cecil/Mono.Cecil/MetadataSystem.cs
@@ -102,8 +102,11 @@ namespace Mono.Cecil {
 
 		public static void TryProcessPrimitiveTypeReference (TypeReference type)
 		{
+			if (type.Namespace != "System")
+				return;
+
 			var scope = type.scope;
-			if (scope == null || scope.MetadataScopeType != MetadataScopeType.AssemblyNameReference || scope.Name != "mscorlib")
+			if (scope == null || scope.MetadataScopeType != MetadataScopeType.AssemblyNameReference)
 				return;
 
 			Row<ElementType, bool> primitive_data;
@@ -118,7 +121,7 @@ namespace Mono.Cecil {
 		{
 			etype = ElementType.None;
 
-			if (!type.HasImage || !type.Module.IsCorlib ())
+			if (type.Namespace != "System")
 				return false;
 
 			Row<ElementType, bool> primitive_data;
@@ -132,11 +135,6 @@ namespace Mono.Cecil {
 
 		static bool TryGetPrimitiveData (TypeReference type, out Row<ElementType, bool> primitive_data)
 		{
-			primitive_data = new Row<ElementType, bool> ();
-
-			if (type.Namespace != "System")
-				return false;
-
 			if (primitive_value_types == null)
 				InitializePrimitives ();
 
diff --git a/Mono.Cecil/Mono.Cecil/ModuleDefinition.cs b/Mono.Cecil/Mono.Cecil/ModuleDefinition.cs
index 1b191815c..fc5b7a838 100644
--- a/Mono.Cecil/Mono.Cecil/ModuleDefinition.cs
+++ b/Mono.Cecil/Mono.Cecil/ModuleDefinition.cs
@@ -195,8 +195,8 @@ namespace Mono.Cecil {
 		internal MetadataSystem MetadataSystem;
 		internal ReadingMode ReadingMode;
 		internal ISymbolReaderProvider SymbolReaderProvider;
-		internal ISymbolReader SymbolReader;
 
+		internal ISymbolReader symbol_reader;
 		internal IAssemblyResolver assembly_resolver;
 		internal IMetadataResolver metadata_resolver;
 		internal TypeSystem type_system;
@@ -208,6 +208,7 @@ namespace Mono.Cecil {
 		TargetRuntime runtime;
 		TargetArchitecture architecture;
 		ModuleAttributes attributes;
+		ModuleCharacteristics characteristics;
 		Guid mvid;
 
 		internal AssemblyDefinition assembly;
@@ -247,6 +248,11 @@ namespace Mono.Cecil {
 			set { attributes = value; }
 		}
 
+		public ModuleCharacteristics Characteristics {
+			get { return characteristics; }
+			set { characteristics = value; }
+		}
+
 		public string FullyQualifiedName {
 			get { return fq_name; }
 		}
@@ -261,7 +267,11 @@ namespace Mono.Cecil {
 		}
 
 		public bool HasSymbols {
-			get { return SymbolReader != null; }
+			get { return symbol_reader != null; }
+		}
+
+		public ISymbolReader SymbolReader {
+			get { return symbol_reader; }
 		}
 
 		public override MetadataScopeType MetadataScopeType {
@@ -283,13 +293,13 @@ namespace Mono.Cecil {
 #endif
 
 		public IAssemblyResolver AssemblyResolver {
-			get { return assembly_resolver; }
+			get { return assembly_resolver ?? (assembly_resolver = new DefaultAssemblyResolver ()); }
 		}
 
 		public IMetadataResolver MetadataResolver {
 			get {
 				if (metadata_resolver == null)
-					Interlocked.CompareExchange (ref metadata_resolver, new MetadataResolver (assembly_resolver), null);
+					Interlocked.CompareExchange (ref metadata_resolver, new MetadataResolver (this.AssemblyResolver), null);
 
 				return metadata_resolver;
 			}
@@ -441,7 +451,6 @@ namespace Mono.Cecil {
 		{
 			this.MetadataSystem = new MetadataSystem ();
 			this.token = new MetadataToken (TokenType.Module, 1);
-			this.assembly_resolver = GlobalAssemblyResolver.Instance;
 		}
 
 		internal ModuleDefinition (Image image)
@@ -452,6 +461,7 @@ namespace Mono.Cecil {
 			this.runtime = image.Runtime;
 			this.architecture = image.Architecture;
 			this.attributes = image.Attributes;
+			this.characteristics = image.Characteristics;
 			this.fq_name = image.FileName;
 
 			this.reader = new MetadataReader (this);
@@ -859,15 +869,27 @@ namespace Mono.Cecil {
 			}
 		}
 
+		public bool HasDebugHeader {
+			get { return Image != null && !Image.Debug.IsZero; }
+		}
+
+		public ImageDebugDirectory GetDebugHeader (out byte [] header)
+		{
+			if (!HasDebugHeader)
+				throw new InvalidOperationException ();
+
+			return Image.GetDebugHeader (out header);
+		}
+
 		void ProcessDebugHeader ()
 		{
-			if (Image == null || Image.Debug.IsZero)
+			if (!HasDebugHeader)
 				return;
 
 			byte [] header;
-			var directory = Image.GetDebugHeader (out header);
+			var directory = GetDebugHeader (out header);
 
-			if (!SymbolReader.ProcessDebugHeader (directory, header))
+			if (!symbol_reader.ProcessDebugHeader (directory, header))
 				throw new InvalidOperationException ();
 		}
 
@@ -890,6 +912,7 @@ namespace Mono.Cecil {
 				architecture = parameters.Architecture,
 				mvid = Guid.NewGuid (),
 				Attributes = ModuleAttributes.ILOnly,
+				Characteristics = (ModuleCharacteristics) 0x8540,
 			};
 
 			if (parameters.AssemblyResolver != null)
@@ -937,7 +960,7 @@ namespace Mono.Cecil {
 			if (reader == null)
 				throw new ArgumentNullException ("reader");
 
-			SymbolReader = reader;
+			symbol_reader = reader;
 
 			ProcessDebugHeader ();
 		}
diff --git a/Mono.Cecil/Mono.Cecil/ModuleKind.cs b/Mono.Cecil/Mono.Cecil/ModuleKind.cs
index d42c7bea2..c29da887d 100644
--- a/Mono.Cecil/Mono.Cecil/ModuleKind.cs
+++ b/Mono.Cecil/Mono.Cecil/ModuleKind.cs
@@ -41,7 +41,7 @@ namespace Mono.Cecil {
 		I386,
 		AMD64,
 		IA64,
-		ARMv7
+		ARMv7,
 	}
 
 	[Flags]
@@ -49,6 +49,16 @@ namespace Mono.Cecil {
 		ILOnly = 1,
 		Required32Bit = 2,
 		StrongNameSigned = 8,
-		Preferred32Bit = 0x00020000
+		Preferred32Bit = 0x00020000,
+	}
+
+	[Flags]
+	public enum ModuleCharacteristics {
+		HighEntropyVA = 0x0020,
+		DynamicBase = 0x0040,
+		NoSEH = 0x0400,
+		NXCompat = 0x0100,
+		AppContainer = 0x1000,
+		TerminalServerAware = 0x8000,
 	}
 }
diff --git a/Mono.Cecil/Mono.Cecil/ParameterDefinition.cs b/Mono.Cecil/Mono.Cecil/ParameterDefinition.cs
index 1cac8e139..928da8940 100644
--- a/Mono.Cecil/Mono.Cecil/ParameterDefinition.cs
+++ b/Mono.Cecil/Mono.Cecil/ParameterDefinition.cs
@@ -54,7 +54,7 @@ namespace Mono.Cecil {
 				if (method == null)
 					return -1;
 
-				return method.HasThis ? index + 1 : index;
+				return method.HasImplicitThis () ? index + 1 : index;
 			}
 		}
 
diff --git a/Mono.Cecil/Mono.Cecil/TypeParser.cs b/Mono.Cecil/Mono.Cecil/TypeParser.cs
index 06dc935a5..3e633ea8d 100644
--- a/Mono.Cecil/Mono.Cecil/TypeParser.cs
+++ b/Mono.Cecil/Mono.Cecil/TypeParser.cs
@@ -272,7 +272,7 @@ namespace Mono.Cecil {
 
 		public static TypeReference ParseType (ModuleDefinition module, string fullname)
 		{
-			if (fullname == null)
+			if (string.IsNullOrEmpty (fullname))
 				return null;
 
 			var parser = new TypeParser (fullname);
diff --git a/Mono.Cecil/Mono.Cecil/TypeSystem.cs b/Mono.Cecil/Mono.Cecil/TypeSystem.cs
index 0dd7701c6..a96fbb59b 100644
--- a/Mono.Cecil/Mono.Cecil/TypeSystem.cs
+++ b/Mono.Cecil/Mono.Cecil/TypeSystem.cs
@@ -34,14 +34,23 @@ namespace Mono.Cecil {
 
 	public abstract class TypeSystem {
 
-		sealed class CorlibTypeSystem : TypeSystem {
+		sealed class CoreTypeSystem : TypeSystem {
 
-			public CorlibTypeSystem (ModuleDefinition module)
+			public CoreTypeSystem (ModuleDefinition module)
 				: base (module)
 			{
 			}
 
 			internal override TypeReference LookupType (string @namespace, string name)
+			{
+				var type = LookupTypeDefinition (@namespace, name) ?? LookupTypeForwarded (@namespace, name);
+				if (type != null)
+					return type;
+
+				throw new NotSupportedException ();
+			}
+
+			TypeReference LookupTypeDefinition (string @namespace, string name)
 			{
 				var metadata = module.MetadataSystem;
 				if (metadata.Types == null)
@@ -64,6 +73,22 @@ namespace Mono.Cecil {
 				});
 			}
 
+			TypeReference LookupTypeForwarded (string @namespace, string name)
+			{
+				if (!module.HasExportedTypes)
+					return null;
+
+				var exported_types = module.ExportedTypes;
+				for (int i = 0; i < exported_types.Count; i++) {
+					var exported_type = exported_types [i];
+
+					if (exported_type.Name == name && exported_type.Namespace == @namespace)
+						return exported_type.CreateReference ();
+				}
+
+				return null;
+			}
+
 			static void Initialize (object obj)
 			{
 			}
@@ -159,7 +184,7 @@ namespace Mono.Cecil {
 		internal static TypeSystem CreateTypeSystem (ModuleDefinition module)
 		{
 			if (module.IsCorlib ())
-				return new CorlibTypeSystem (module);
+				return new CoreTypeSystem (module);
 
 			return new CommonTypeSystem (module);
 		}
diff --git a/Mono.Cecil/Test/Mono.Cecil.Tests.csproj b/Mono.Cecil/Test/Mono.Cecil.Tests.csproj
index 31f297842..2ff2951f8 100644
--- a/Mono.Cecil/Test/Mono.Cecil.Tests.csproj
+++ b/Mono.Cecil/Test/Mono.Cecil.Tests.csproj
@@ -116,6 +116,7 @@
     <Compile Include="Mono.Cecil.Tests\ImageReadTests.cs" />
     <Compile Include="Mono.Cecil.Tests\ModuleTests.cs" />
     <Compile Include="Mono.Cecil.Tests\NestedTypesTests.cs" />
+    <None Include="Resources\il\explicitthis.il" />
     <None Include="Resources\cs\CustomAttributes.cs" />
     <None Include="Resources\cs\Generics.cs" />
     <None Include="Resources\cs\Interfaces.cs" />
diff --git a/Mono.Cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs b/Mono.Cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs
index e77bfe066..8f68e5fc8 100644
--- a/Mono.Cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs
+++ b/Mono.Cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs
@@ -115,5 +115,30 @@ namespace Mono.Cecil.Tests {
 			Assert.AreEqual (TargetArchitecture.I386, module.Image.Architecture);
 			Assert.AreEqual (ModuleAttributes.ILOnly, module.Image.Attributes);
 		}
+
+		[TestModule ("delay-signed.dll")]
+		public void DelaySignedAssembly (ModuleDefinition module)
+		{
+			Assert.IsNotNull (module.Assembly.Name.PublicKey);
+			Assert.AreNotEqual (0, module.Assembly.Name.PublicKey.Length);
+			Assert.AreNotEqual (ModuleAttributes.StrongNameSigned, module.Attributes & ModuleAttributes.StrongNameSigned);
+			Assert.AreNotEqual (0, module.Image.StrongName.VirtualAddress);
+			Assert.AreNotEqual (0, module.Image.StrongName.Size);
+		}
+
+		[TestModule ("wp7.dll", Verify = false)]
+		public void WindowsPhoneNonSignedAssembly (ModuleDefinition module)
+		{
+			Assert.AreEqual (0, module.Assembly.Name.PublicKey.Length);
+			Assert.AreNotEqual (ModuleAttributes.StrongNameSigned, module.Attributes & ModuleAttributes.StrongNameSigned);
+			Assert.AreEqual (0, module.Image.StrongName.VirtualAddress);
+			Assert.AreEqual (0, module.Image.StrongName.Size);
+		}
+
+		[TestModule ("metro.exe", Verify = false)]
+		public void MetroAssembly (ModuleDefinition module)
+		{
+			Assert.AreEqual (ModuleCharacteristics.AppContainer, module.Characteristics & ModuleCharacteristics.AppContainer);
+		}
 	}
 }
diff --git a/Mono.Cecil/Test/Mono.Cecil.Tests/TypeTests.cs b/Mono.Cecil/Test/Mono.Cecil.Tests/TypeTests.cs
index 878885b4a..3ceb0aa4d 100644
--- a/Mono.Cecil/Test/Mono.Cecil.Tests/TypeTests.cs
+++ b/Mono.Cecil/Test/Mono.Cecil.Tests/TypeTests.cs
@@ -209,5 +209,20 @@ namespace Mono.Cecil.Tests {
 			Assert.IsTrue (int32_def.IsPrimitive);
 			Assert.AreEqual (MetadataType.Int32, int32_def.MetadataType);
 		}
+
+		[TestIL ("explicitthis.il", Verify = false)]
+		public void ExplicitThis (ModuleDefinition module)
+		{
+			var type = module.GetType ("MakeDecision");
+			var method = type.GetMethod ("Decide");
+			var fptr = method.ReturnType as FunctionPointerType;
+
+			Assert.IsNotNull (fptr);
+			Assert.IsTrue (fptr.HasThis);
+			Assert.IsTrue (fptr.ExplicitThis);
+
+			Assert.AreEqual (0, fptr.Parameters [0].Sequence);
+			Assert.AreEqual (1, fptr.Parameters [1].Sequence);
+		}
 	}
 }
diff --git a/Mono.Cecil/Test/Resources/assemblies/delay-signed.dll b/Mono.Cecil/Test/Resources/assemblies/delay-signed.dll
new file mode 100644
index 0000000000000000000000000000000000000000..3571ccfd4bf14322385363d56c2d96863c1a1902
GIT binary patch
literal 3584
zcmeHJU2GIp6#izrZAyU#l@tg`JJ4bf?WVLPN+PoT#bW=`Efuv|_GjD<ncZ1trr1g#
zYt)J+CPs)cnixzpJ{S!TMvJHq8XpuJ)V^p^A|}L`n4k}YA~E83?#%WFiSpos(Vp3R
z&OJZ(-tU|{_s(|R{~U?{gxRiK0VXJgqKf}D%hO$6^?o_tSu(k9LhGDd*FS8!dd{)a
zPCTP0<Jqk3=?O!3MzXq@)mwXFdd5x}k>$(FYJ#bI+kj532<uDTp2BKp5n8uYD+Nku
zkw&VN0XkchO_)v*@^Q1L@QXyAjdr0TM4tp!sNb9nR6hh?R0C?^D02_S1ukFg0hTQ=
zT&JP~%wU#Esoy=T0TIs_^{CfK;ptO(UbQ~Wdm@hOB<WVzqU=cg{E4a39E~`JWiwD=
z-9w|ybro>NHPgC~q^=~v7D6$mb>J6{)x<cDdUe0F^GyHBZW%UJhBoqzF586W*v@7x
z$V5u9zcEr5X{c-1yj7qV!y^BNt@;qq%7l+gKjt}RHtn*D3$#h8t9Qll8~c2dP`zVU
zM=Rwr*65t*&6b^@6q2&-SP3i<<?@CGRQPoy8nqqttFtCj>MM;v16hK4+{)J=i5Bw5
z$%XtFKZ_MuOG`0r8ot!U`vSJA@l#40U%d_G^xc4MxDji}%ZWvJ1WR#({3d*ia2~TH
zv#-Ld<nme-NW=O<7r3*_PK{W`T}T;Le5}?r(^(@GNm&*;&4d$oka3f?W0?uW#$3<H
zpeM1{NP1|uZA6lu?F9Bn-$>RoGe)Gv&g4wXaAJnD-%J`Vd_&wb?Q9>{7*##D$>T;O
zMmz(-KnbHOVOpj)Hs_rWOHdc-3j4nF^!VvZ15M+PO+0(?<=k5+eeco1fi;b1pXP38
z4AR27rj_Q8fd?R*2aa-BiR=vZzF5;{sfZN%vm;fPKONfHcciSg{`G@z-~P(?Z6&p<
zX3m7Sbiee(;pd%;$@uiI`2z>Po$<at`NPzMpC3*g*z#J(cQgCiAK3EaQv<o;Ui19E
znTp+?+}v^Io>QUflHQJ$y@%dho8OMA$)j)F*XSk(KYF+2s}uD&fAXijmF`1>+Em3e
zr%s={WzD6UW2IVf+$#l5f2iVKC!XuJvu&eEBPTWMA9n0VT-nJB)noycGY#kk?J6n0
zSsH4womR{0ikn$~FAYO&uLNA#06jVzx!C!yS3pyD-0DAF_5S@+cMZE#M7|xnqrjjX
zpMVBKjqD8|h9UAc^s(2$FKsvV4)S*YtBViAKmT61<qBg(ZVwcmLUnfrsuHc_8fT5e
z;XEeqaf5Sa@i1)VuTi&IKfQ5UUHaqj7-v)S>3H}99vF?7JVu$cr>`;7iz=oLg{Kh-
z_JP}oNSlps<?1ePZJ8&xU>%*Ybv(Uuu>*{C7(Iujj<@n$<9CR+x2Cf3RBV>mE!HcJ
z40RwyF8Pe1R?U+pc7xUko5e?Hqr%rods>ZdVdgoG5QJ$A6C>2s(5cqy3G7k@S*uV{
z(XM~ZMwMqT=dy`pg!S;aLkqK=%Tsa&?oeZzn1{>A46ADqrT(|$B*#Vihbo}^e-m{%
Ku8Z`)tH2*VMnt**

literal 0
HcmV?d00001

diff --git a/Mono.Cecil/Test/Resources/assemblies/metro.exe b/Mono.Cecil/Test/Resources/assemblies/metro.exe
new file mode 100644
index 0000000000000000000000000000000000000000..68784b316eedb4c3d48f2e1a8b20b7d815466b4a
GIT binary patch
literal 15872
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
MmH!Lue}o7A0}FAnkN^Mx

literal 0
HcmV?d00001

diff --git a/Mono.Cecil/Test/Resources/assemblies/wp7.dll b/Mono.Cecil/Test/Resources/assemblies/wp7.dll
new file mode 100644
index 0000000000000000000000000000000000000000..c3cbf7b6f1b145382d4ff0ddc529e66762775762
GIT binary patch
literal 10752
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

literal 0
HcmV?d00001

diff --git a/Mono.Cecil/Test/Resources/il/explicitthis.il b/Mono.Cecil/Test/Resources/il/explicitthis.il
new file mode 100644
index 000000000..59b332769
--- /dev/null
+++ b/Mono.Cecil/Test/Resources/il/explicitthis.il
@@ -0,0 +1,113 @@
+.assembly extern mscorlib
+{
+  .ver 0:0:0:0
+}
+
+.assembly fptr
+{
+  .ver 0:0:0:0
+}
+.module fptr.exe
+
+.method public static void  Main() cil managed
+{
+	.entrypoint
+	.locals init (class MakeDecision d, method instance explicit int32 *(class MakeDecision, int32) m, int32 i)
+
+	ldc.i4.1
+	ldc.i4 42
+	newobj     instance void MakeDecision::.ctor(bool, int32)
+	stloc d
+
+	ldc.i4.0
+	stloc i
+	br test
+
+loop:
+	ldloc d
+	call       instance method instance explicit int32 *(class MakeDecision, int32) MakeDecision::Decide()
+	stloc m
+
+	ldloc d
+	ldc.i4.1
+	ldloc m
+	calli      instance int32(int32)
+	call       void [mscorlib]System.Console::WriteLine(int32)
+
+	ldloc i
+	ldc.i4.1
+	add
+	stloc i
+
+test:
+	ldloc i
+	ldc.i4 10
+	blt loop
+
+	ret
+}
+
+.class public auto ansi sealed MakeDecision
+       extends [mscorlib]System.Object
+{
+	.field private bool Oscillate
+	.field private int32 Value
+
+	.method public instance method instance explicit int32 *(class MakeDecision, int32) Decide() cil managed
+	{
+		.locals init (bool t)
+
+		ldarg.0
+		ldfld     bool MakeDecision::Oscillate
+		stloc t
+
+		ldarg.0
+		ldloc t
+		ldc.i4.0
+		ceq
+		stfld bool MakeDecision::Oscillate
+
+		ldloc t
+		brfalse subs
+
+		ldftn      instance int32 MakeDecision::Add(int32)
+		ret
+
+	subs:
+		ldftn      instance int32 MakeDecision::Sub(int32)
+		ret
+	}
+
+	.method public int32  Add(int32 i) cil managed
+	{
+		ldarg.0
+		ldfld      int32 MakeDecision::Value
+		ldarg      i
+		add
+		ret
+	}
+
+	.method public int32  Sub(int32 i) cil managed
+	{
+		ldarg.0
+		ldfld      int32 MakeDecision::Value
+		ldarg      i
+		sub
+		ret
+	}
+
+	.method public hidebysig specialname rtspecialname  instance void  .ctor(bool s, int32 val) cil managed
+	{
+		ldarg.0
+		ldarg s
+		stfld      bool MakeDecision::Oscillate
+
+		ldarg.0
+		ldarg val
+		stfld      int32 MakeDecision::Value
+
+		ldarg.0
+		call       instance void [mscorlib]System.Object::.ctor()
+		ret
+	}
+}
diff --git a/Mono.Cecil/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs b/Mono.Cecil/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
index 937b0a516..6ad39d237 100644
--- a/Mono.Cecil/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
+++ b/Mono.Cecil/symbols/mdb/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
@@ -446,6 +446,11 @@ namespace Mono.CompilerServices.SymbolWriter
 		protected MonoSymbolFile (string filename, Mono.Cecil.ModuleDefinition module)
 			: this (filename)
 		{
+			// Check that the MDB file matches the module, if we have been
+			// passed a module.
+			if (module == null)
+				return;
+
 			CheckGuidMatch (module.Mvid, filename, module.FullyQualifiedName);
 		}
 
@@ -485,7 +490,7 @@ namespace Mono.CompilerServices.SymbolWriter
 
 		public static MonoSymbolFile ReadSymbolFile (string mdbFilename)
 		{
-			return new MonoSymbolFile (mdbFilename, null);
+			return new MonoSymbolFile (mdbFilename);
 		}
 
 		public int CompileUnitCount {