Imported Upstream version 5.4.0.199

Former-commit-id: f4d318e4b2f128fa9f4d31b37bb3839a3fc0dfb2

external/linker/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs

@@ -35,11 +35,12 @@ namespace Mono.Cecil.Pdb {
 			this.pdb_file = file;
 		}
 
+#if !READ_ONLY
 		public ISymbolWriterProvider GetWriterProvider ()
 		{
 			return new NativePdbWriterProvider ();
 		}
-
+#endif
 		/*
 		uint Magic = 0x53445352;
 		Guid Signature;
@@ -211,6 +212,7 @@ namespace Mono.Cecil.Pdb {
 				} else {
 					import = GetImport (scope, info.Method.Module);
 					imports.Add (scope, import);
+					parent.import = import;
 				}
 			}
 
@@ -262,6 +264,9 @@ namespace Mono.Cecil.Pdb {
 			var import = new ImportDebugInformation ();
 
 			foreach (var used_namespace in scope.usedNamespaces) {
+				if (string.IsNullOrEmpty (used_namespace))
+					continue;
+
 				ImportTarget target = null;
 				var value = used_namespace.Substring (1);
 				switch (used_namespace [0]) {

external/linker/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs

@@ -80,6 +80,10 @@ namespace Mono.Cecil.Pdb {
 			this.metadata = metadata;
 		}
 
+		void IMetadataSymbolWriter.WriteModule ()
+		{
+		}
+
 		void DefineCustomMetadata (MethodDebugInformation info, MetadataToken import_parent)
 		{
 			var metadata = new CustomMetadataWriter (this.writer);

external/linker/cecil/symbols/pdb/Test/Mono.Cecil.Tests/PdbTests.cs

@@ -1,4 +1,4 @@
-
+#if !READ_ONLY
 using System.IO;
 using System.Linq;
 
@@ -153,6 +153,13 @@ namespace Mono.Cecil.Tests {
 			}, readOnly: Platform.OnMono, symbolReaderProvider: typeof (PdbReaderProvider), symbolWriterProvider: typeof (PdbWriterProvider));
 		}
 
+		[Test]
+		public void EmptyRootNamespace ()
+		{
+			TestModule ("EmptyRootNamespace.dll", module => {
+			}, readOnly: Platform.OnMono, symbolReaderProvider: typeof(PdbReaderProvider), symbolWriterProvider: typeof(PdbWriterProvider));
+		}
+
 		[Test]
 		public void LocalVariables ()
 		{
@@ -358,6 +365,42 @@ namespace Mono.Cecil.Tests {
 			}, readOnly: Platform.OnMono, symbolReaderProvider: typeof (PdbReaderProvider), symbolWriterProvider: typeof (PdbWriterProvider));
 		}
 
+		[Test]
+		public void ImportsForFirstMethod ()
+		{
+			TestModule ("CecilTest.exe", module => {
+				var type = module.GetType ("CecilTest.Program");
+				var method = type.GetMethod ("Main");
+
+				var debug = method.DebugInformation;
+				var scope = debug.Scope;
+
+				Assert.IsTrue (scope.End.IsEndOfMethod);
+
+				var import = scope.Import;
+
+				Assert.IsNotNull (import);
+				Assert.AreEqual (5, import.Targets.Count);
+
+				var ns = new [] {
+					"System",
+					"System.Collections.Generic",
+					"System.Linq",
+					"System.Text",
+					"System.Threading.Tasks",
+				};
+
+				for (int i = 0; i < import.Targets.Count; i++) {
+					var target = import.Targets [i];
+
+					Assert.AreEqual (ImportTargetKind.ImportNamespace, target.Kind);
+					Assert.AreEqual (ns [i], target.Namespace);
+				}
+
+				Assert.AreEqual ("System", import.Targets [0].Namespace);
+			}, readOnly: Platform.OnMono, symbolReaderProvider: typeof (PdbReaderProvider), symbolWriterProvider: typeof (PdbWriterProvider));
+		}
+
 		[Test]
 		public void CreateMethodFromScratch ()
 		{
@@ -412,3 +455,4 @@ namespace Mono.Cecil.Tests {
 		}
 	}
 }
+#endif