Fix crash in disassembler and decompiler when HasPInvokeInfo=true but PInvokeInfo=null (occurs with unmanaged methods in C++/CLI assemblies)

Author: dgrunwald

ICSharpCode.Decompiler/Ast/AstBuilder.cs

@@ -1151,7 +1151,7 @@ void ConvertAttributes(AttributedNode attributedNode, MethodDefinition methodDef
 			MethodImplAttributes implAttributes = methodDefinition.ImplAttributes & ~MethodImplAttributes.CodeTypeMask;
 
 			#region DllImportAttribute
-			if (methodDefinition.HasPInvokeInfo) {
+			if (methodDefinition.HasPInvokeInfo && methodDefinition.PInvokeInfo != null) {
 				PInvokeInfo info = methodDefinition.PInvokeInfo;
 				Ast.Attribute dllImport = CreateNonCustomAttribute(typeof(DllImportAttribute));
 				dllImport.Arguments.Add(new PrimitiveExpression(info.Module.Name));

ICSharpCode.Decompiler/Ast/NameVariables.cs

@@ -284,6 +284,8 @@ static string GetNameForArgument(ILExpression parent, int i)
 
 		string GetNameByType(TypeReference type)
 		{
+			type = TypeAnalysis.UnpackModifiers(type);
+			
 			GenericInstanceType git = type as GenericInstanceType;
 			if (git != null && git.ElementType.FullName == "System.Nullable`1" && git.GenericArguments.Count == 1) {
 				type = ((GenericInstanceType)type).GenericArguments[0];

ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs

@@ -117,7 +117,7 @@ void DisassembleMethodInternal(MethodDefinition method)
 
 			if ((method.Attributes & MethodAttributes.PInvokeImpl) == MethodAttributes.PInvokeImpl) {
 				output.Write("pinvokeimpl");
-				if (method.HasPInvokeInfo) {
+				if (method.HasPInvokeInfo && method.PInvokeInfo != null) {
 					PInvokeInfo info = method.PInvokeInfo;
 					output.Write("(\"" + NRefactory.CSharp.OutputVisitor.ConvertString(info.Module.Name) + "\"");
 

ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs

@@ -849,7 +849,7 @@ static TypeReference UnpackPointer(TypeReference pointerOrManagedReference)
 			return null;
 		}
 
-		static TypeReference UnpackModifiers(TypeReference type)
+		internal static TypeReference UnpackModifiers(TypeReference type)
 		{
 			while (type is OptionalModifierType || type is RequiredModifierType)
 				type = ((TypeSpecification)type).ElementType;

ILSpy/Languages/CSharpLanguage.cs

@@ -251,6 +251,9 @@ public override void DecompileAssembly(LoadedAssembly assembly, ITextOutput outp
 						output.WriteLine("// Architecture: Itanium-64");
 						break;
 				}
+				if ((mainModule.Attributes & ModuleAttributes.ILOnly) == 0) {
+					output.WriteLine("// This assembly contains unmanaged code.");
+				}
 				switch (mainModule.Runtime) {
 					case TargetRuntime.Net_1_0:
 						output.WriteLine("// Runtime: .NET 1.0");