Merge pull request icsharpcode#1425 from icsharpcode/nullable-referen…

…ce-types C# 8.0 nullable reference types
dnSpyEx · Jul 15, 2021 · e39e4bc · e39e4bc
1 parent f36b78b
commit e39e4bc
Show file tree

Hide file tree

Showing 288 changed files with 1,531 additions and 447,750 deletions.
diff --git a/ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj b/ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
     <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <AssemblyName>ilspycmd</AssemblyName>
   </PropertyGroup>
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.0" />
-	
+
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />

diff --git a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
@@ -341,6 +341,7 @@ void RunCS([CallerMemberName] string testName = null, CompilerOptions options =
 
 		void RunVB([CallerMemberName] string testName = null, CompilerOptions options = CompilerOptions.UseDebug)
 		{
+			options |= CompilerOptions.ReferenceVisualBasic;
 			string testFileName = testName + ".vb";
 			string testOutputFileName = testName + Tester.GetSuffix(options) + ".exe";
 			CompilerResults outputFile = null, decompiledOutputFile = null;

diff --git a/ICSharpCode.Decompiler.Tests/Helpers/RemoveCompilerAttribute.cs b/ICSharpCode.Decompiler.Tests/Helpers/RemoveCompilerAttribute.cs
@@ -33,11 +33,13 @@ public void Run(AstNode rootNode, TransformContext context)
 		}
 	}
 
-	public class RemoveEmbeddedAtttributes : DepthFirstAstVisitor, IAstTransform
+	public class RemoveEmbeddedAttributes : DepthFirstAstVisitor, IAstTransform
 	{
 		HashSet<string> attributeNames = new HashSet<string>() {
 			"System.Runtime.CompilerServices.IsReadOnlyAttribute",
 			"System.Runtime.CompilerServices.IsByRefLikeAttribute",
+			"System.Runtime.CompilerServices.IsUnmanagedAttribute",
+			"System.Runtime.CompilerServices.NullableAttribute",
 			"Microsoft.CodeAnalysis.EmbeddedAttribute",
 		};
 

diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs
@@ -26,8 +26,12 @@ public static CompilerResults CompileVB(string sourceFileName, CompilerOptions f
 			if (flags.HasFlag(CompilerOptions.UseRoslyn)) {
 				var parseOptions = new VisualBasicParseOptions(preprocessorSymbols: preprocessorSymbols, languageVersion: LanguageVersion.Latest);
 				var syntaxTrees = sourceFileNames.Select(f => SyntaxFactory.ParseSyntaxTree(File.ReadAllText(f), parseOptions, path: f));
+				var references = defaultReferences.Value;
+				if (flags.HasFlag(CompilerOptions.ReferenceVisualBasic)) {
+					references = references.Concat(visualBasic.Value);
+				}
 				var compilation = VisualBasicCompilation.Create(Path.GetFileNameWithoutExtension(sourceFileName),
-					syntaxTrees, defaultReferences.Value,
+					syntaxTrees, references,
 					new VisualBasicCompilationOptions(
 					flags.HasFlag(CompilerOptions.Library) ? OutputKind.DynamicallyLinkedLibrary : OutputKind.ConsoleApplication,
 					platform: flags.HasFlag(CompilerOptions.Force32Bit) ? Platform.X86 : Platform.AnyCpu,
@@ -65,7 +69,9 @@ public static CompilerResults CompileVB(string sourceFileName, CompilerOptions f
 				options.ReferencedAssemblies.Add("System.dll");
 				options.ReferencedAssemblies.Add("System.Core.dll");
 				options.ReferencedAssemblies.Add("System.Xml.dll");
-				options.ReferencedAssemblies.Add("Microsoft.VisualBasic.dll");
+				if (flags.HasFlag(CompilerOptions.ReferenceVisualBasic)) {
+					options.ReferencedAssemblies.Add("Microsoft.VisualBasic.dll");
+				}
 				CompilerResults results = provider.CompileAssemblyFromFile(options, sourceFileNames.ToArray());
 				if (results.Errors.Cast<CompilerError>().Any(e => !e.IsWarning)) {
 					StringBuilder b = new StringBuilder("Compiler error:");

diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
@@ -49,6 +49,7 @@ public enum CompilerOptions
 		Library = 0x8,
 		UseRoslyn = 0x10,
 		UseMcs = 0x20,
+		ReferenceVisualBasic = 0x40,
 	}
 
 	[Flags]
@@ -176,24 +177,31 @@ private static string ReplacePrivImplDetails(string il)
 			return Regex.Replace(il, @"'<PrivateImplementationDetails>\{[0-9A-F-]+\}'", "'<PrivateImplementationDetails>'");
 		}
 
+		static readonly string refAsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86),
+				@"Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2");
+		static readonly string thisAsmPath = Path.GetDirectoryName(typeof(Tester).Assembly.Location);
+
 		static readonly Lazy<IEnumerable<MetadataReference>> defaultReferences = new Lazy<IEnumerable<MetadataReference>>(delegate {
-			string refAsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86),
-				@"Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5");
-			string thisAsmPath = Path.GetDirectoryName(typeof(Tester).Assembly.Location);
 			return new[]
 			{
+					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "Facades\\netstandard.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "mscorlib.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.Core.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, @"Facades\System.Runtime.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "System.Xml.dll")),
 					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "Microsoft.CSharp.dll")),
-					MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "Microsoft.VisualBasic.dll")),
 					MetadataReference.CreateFromFile(typeof(ValueTuple).Assembly.Location),
 					MetadataReference.CreateFromFile(typeof(Span<>).Assembly.Location),
 			};
 		});
 
+		static readonly Lazy<IEnumerable<MetadataReference>> visualBasic = new Lazy<IEnumerable<MetadataReference>>(delegate {
+			return new[] {
+				MetadataReference.CreateFromFile(Path.Combine(refAsmPath, "Microsoft.VisualBasic.dll"))
+			};
+		});
+
 		public static List<string> GetPreprocessorSymbols(CompilerOptions flags)
 		{
 			var preprocessorSymbols = new List<string>();
@@ -232,10 +240,17 @@ public static CompilerResults CompileCSharp(string sourceFileName, CompilerOptio
 			var preprocessorSymbols = GetPreprocessorSymbols(flags);
 
 			if (flags.HasFlag(CompilerOptions.UseRoslyn)) {
-				var parseOptions = new CSharpParseOptions(preprocessorSymbols: preprocessorSymbols.ToArray(), languageVersion: Microsoft.CodeAnalysis.CSharp.LanguageVersion.Latest);
+				var parseOptions = new CSharpParseOptions(
+					preprocessorSymbols: preprocessorSymbols.ToArray(),
+					languageVersion: Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp8
+				);
 				var syntaxTrees = sourceFileNames.Select(f => SyntaxFactory.ParseSyntaxTree(File.ReadAllText(f), parseOptions, path: f));
+				var references = defaultReferences.Value;
+				if (flags.HasFlag(CompilerOptions.ReferenceVisualBasic)) {
+					references = references.Concat(visualBasic.Value);
+				}
 				var compilation = CSharpCompilation.Create(Path.GetFileNameWithoutExtension(sourceFileName),
-					syntaxTrees, defaultReferences.Value,
+					syntaxTrees, references,
 					new CSharpCompilationOptions(
 						flags.HasFlag(CompilerOptions.Library) ? OutputKind.DynamicallyLinkedLibrary : OutputKind.ConsoleApplication,
 						platform: flags.HasFlag(CompilerOptions.Force32Bit) ? Platform.X86 : Platform.AnyCpu,
@@ -322,7 +337,9 @@ public static CompilerResults CompileCSharp(string sourceFileName, CompilerOptio
 				options.ReferencedAssemblies.Add("System.Core.dll");
 				options.ReferencedAssemblies.Add("System.Xml.dll");
 				options.ReferencedAssemblies.Add("Microsoft.CSharp.dll");
-				options.ReferencedAssemblies.Add("Microsoft.VisualBasic.dll");
+				if (flags.HasFlag(CompilerOptions.ReferenceVisualBasic)) {
+					options.ReferencedAssemblies.Add("Microsoft.VisualBasic.dll");
+				}
 				CompilerResults results = provider.CompileAssemblyFromFile(options, sourceFileNames.ToArray());
 				if (results.Errors.Cast<CompilerError>().Any(e => !e.IsWarning)) {
 					StringBuilder b = new StringBuilder("Compiler error:");
@@ -408,10 +425,10 @@ public static string DecompileCSharp(string assemblyFileName, DecompilerSettings
 			resolver.PostSearchPaths.Add(Path.GetDirectoryName(typeof(Span<>).Assembly.Location));
 			using (var module = ModuleDefMD.Load(assemblyFileName, resolver.DefaultModuleContext)) {
 				CSharpDecompiler decompiler = new CSharpDecompiler(new PEFile(module), settings ?? new DecompilerSettings());
-				decompiler.AstTransforms.Insert(0, new RemoveEmbeddedAtttributes());
+				decompiler.AstTransforms.Insert(0, new RemoveEmbeddedAttributes());
 				decompiler.AstTransforms.Insert(0, new RemoveCompilerAttribute());
 				decompiler.AstTransforms.Add(new EscapeInvalidIdentifiers());
-				var syntaxTree = decompiler.DecompileWholeModuleAsSingleFile();
+				var syntaxTree = decompiler.DecompileWholeModuleAsSingleFile(sortTypes: true);
 
 				StringWriter output = new StringWriter();
 				var visitor = new CSharpOutputVisitor(output, FormattingOptionsFactory.CreateSharpDevelop());

diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <LangVersion>7.3</LangVersion>
 
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -32,14 +32,18 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NET46;ROSLYN;CS60;CS70</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET46;ROSLYN;CS60;CS70;CS71;CS72;CS73</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET46;ROSLYN;CS60;CS70;CS71;CS72;CS73</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="DiffLib" Version="2017.7.26.1241" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.10.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.0.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
@@ -79,6 +83,7 @@
     <Compile Include="TestCases\ILPretty\Issue1323.cs" />
     <Compile Include="TestCases\Pretty\CustomAttributes2.cs" />
     <Compile Include="TestCases\Pretty\EnumTests.cs" />
+    <None Include="TestCases\Pretty\NullableRefTypes.cs" />
     <Compile Include="TestCases\Pretty\TypeMemberTests.cs" />
     <Compile Include="TestCases\Pretty\ValueTypes.cs" />
     <None Include="TestCases\ILPretty\Issue1389.il" />

diff --git a/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs b/ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
@@ -258,7 +258,6 @@ public void FixProxyCalls([ValueSource(nameof(defaultOptions))] CompilerOptions
 		}
 
 		[Test]
-		[Ignore("Special cases not implemented in new decompiler.")]
 		public void ValueTypes([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions)
 		{
 			RunForLibrary(cscOptions: cscOptions);
@@ -288,6 +287,12 @@ public void AsyncMain([ValueSource(nameof(roslynOnlyOptions))] CompilerOptions c
 			Run(cscOptions: cscOptions);
 		}
 
+		[Test]
+		public void NullableRefTypes([ValueSource(nameof(roslynOnlyOptions))] CompilerOptions cscOptions)
+		{
+			RunForLibrary(cscOptions: cscOptions);
+		}
+
 		[Test]
 		public void NullPropagation([ValueSource(nameof(roslynOnlyOptions))] CompilerOptions cscOptions)
 		{
@@ -433,26 +438,25 @@ void RunForLibrary([CallerMemberName] string testName = null, AssemblerOptions a
 
 		void Run([CallerMemberName] string testName = null, AssemblerOptions asmOptions = AssemblerOptions.None, CompilerOptions cscOptions = CompilerOptions.None, DecompilerSettings decompilerSettings = null)
 		{
-			var ilFile = Path.Combine(TestCasePath, testName) + Tester.GetSuffix(cscOptions) + ".il";
 			var csFile = Path.Combine(TestCasePath, testName + ".cs");
-
-			if (!File.Exists(ilFile)) {
-				// re-create .il file if necessary
-				CompilerResults output = null;
-				try {
-					string outputFile = Path.ChangeExtension(ilFile,
-						cscOptions.HasFlag(CompilerOptions.Library) ? ".dll" : ".exe");
-					output = Tester.CompileCSharp(csFile, cscOptions, outputFile);
-					Tester.Disassemble(output.PathToAssembly, ilFile, asmOptions);
-				} finally {
-					if (output != null)
-						output.TempFiles.Delete();
-				}
+			var exeFile = Path.Combine(TestCasePath, testName) + Tester.GetSuffix(cscOptions) + ".exe";
+			if (cscOptions.HasFlag(CompilerOptions.Library)) {
+				exeFile = Path.ChangeExtension(exeFile, ".dll");
 			}
 
-			var executable = Tester.AssembleIL(ilFile, asmOptions);
-			var decompiled = Tester.DecompileCSharp(executable, decompilerSettings ?? Tester.GetSettings(cscOptions));
+			// 1. Compile
+			CompilerResults output = null;
+			try {
+				output = Tester.CompileCSharp(csFile, cscOptions, exeFile);
+			} finally {
+				if (output != null)
+					output.TempFiles.Delete();
+			}
 
+			// 2. Decompile
+			var decompiled = Tester.DecompileCSharp(exeFile, decompilerSettings ?? Tester.GetSettings(cscOptions));
+
+			// 3. Compile
 			CodeAssert.FilesAreEqual(csFile, decompiled, Tester.GetPreprocessorSymbols(cscOptions).ToArray());
 		}
 	}

diff --git a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Debug.cs b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Debug.cs
@@ -1,4 +1,3 @@
-
 // C:\Users\Siegfried\Documents\Visual Studio 2017\Projects\ConsoleApp13\ConsoleApplication1\bin\Debug\ConsoleApplication1.exe
 // ConsoleApplication1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
 // Global type: <Module>
@@ -170,10 +169,10 @@ public static int main(string[] argv)
 }
 namespace _003CStartupCode_0024ConsoleApplication1_003E
 {
-	internal static class _0024Program
+	internal static class _0024AssemblyInfo
 	{
 	}
-	internal static class _0024AssemblyInfo
+	internal static class _0024Program
 	{
 	}
 }

diff --git a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Release.cs b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/FSharpLoops_Release.cs
@@ -172,10 +172,10 @@ public static int main(string[] argv)
 }
 namespace _003CStartupCode_0024ConsoleApplication1_003E
 {
-	internal static class _0024Program
+	internal static class _0024AssemblyInfo
 	{
 	}
-	internal static class _0024AssemblyInfo
+	internal static class _0024Program
 	{
 	}
 }

diff --git a/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue1325.cs b/ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue1325.cs
@@ -12,16 +12,7 @@
 [assembly: TargetFramework(".NETCoreApp,Version=v2.1", FrameworkDisplayName = "")]
 [assembly: AssemblyConfiguration("Debug")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-namespace Microsoft.VisualBasic
-{
-	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Module | AttributeTargets.Class, Inherited = false)]
-	[CompilerGenerated]
-	[EditorBrowsable(EditorBrowsableState.Never)]
-	[Embedded]
-	internal sealed class Embedded : Attribute
-	{
-	}
-}
+
 namespace Issue1325
 {
 	[StandardModule]
@@ -40,19 +31,7 @@ public static void TestCode(Test t, int i)
 			t.Unparameterized = str + "asdf";
 		}
 	}
-}
-namespace Microsoft.VisualBasic.CompilerServices
-{
-	[EditorBrowsable(EditorBrowsableState.Never)]
-	[AttributeUsage(AttributeTargets.Class, Inherited = false)]
-	[CompilerGenerated]
-	[Embedded]
-	internal sealed class StandardModuleAttribute : Attribute
-	{
-	}
-}
-namespace Issue1325
-{
+
 	internal class Test
 	{
 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]
@@ -71,4 +50,24 @@ public string Unparameterized {
 			set;
 		}
 	}
-}
+}
+namespace Microsoft.VisualBasic
+{
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Module | AttributeTargets.Class, Inherited = false)]
+	[CompilerGenerated]
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	[Embedded]
+	internal sealed class Embedded : Attribute
+	{
+	}
+}
+namespace Microsoft.VisualBasic.CompilerServices
+{
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+	[CompilerGenerated]
+	[Embedded]
+	internal sealed class StandardModuleAttribute : Attribute
+	{
+	}
+}