- Changed [Field|Parameter]Info.__FieldMarshal property to __TryGetFieldMarshal method.

- Changed FieldMarshal class into a value type with public fields.

reflect/CustomAttributeData.cs

@@ -710,8 +710,8 @@ namespace IKVM.Reflection
 			List<CustomAttributeData> list = parameter.Module.GetCustomAttributes(parameter.MetadataToken, attributeType);
 			if (attributeType == null || attributeType.IsAssignableFrom(parameter.Module.universe.System_Runtime_InteropServices_MarshalAsAttribute))
 			{
-				FieldMarshal spec = parameter.__FieldMarshal;
-				if (spec != null)
+				FieldMarshal spec;
+				if (parameter.__TryGetFieldMarshal(out spec))
 				{
 					list.Add(spec.ToCustomAttribute(parameter.Module));
 				}

reflect/Emit/FieldBuilder.cs

@@ -99,9 +99,10 @@ namespace IKVM.Reflection.Emit
 			get { throw new NotImplementedException(); }
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { throw new NotImplementedException(); }
+			fieldMarshal = new FieldMarshal();
+			return false;
 		}
 
 		public void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)

reflect/Emit/MethodBuilder.cs

@@ -515,9 +515,10 @@ namespace IKVM.Reflection.Emit
 				return method.customModifiers.GetParameterCustomModifiers(parameter);
 			}
 
-			public override FieldMarshal __FieldMarshal
+			public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 			{
-				get { return null; }
+				fieldMarshal = new FieldMarshal();
+				return false;
 			}
 
 			public override MemberInfo Member

reflect/FieldInfo.cs

@@ -43,7 +43,7 @@ namespace IKVM.Reflection
 		public abstract void __GetDataFromRVA(byte[] data, int offset, int length);
 		public abstract int __FieldRVA { get; }
 		public abstract int __FieldOffset { get; }
-		public abstract FieldMarshal __FieldMarshal { get; }
+		public abstract bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal);
 		public abstract Object GetRawConstantValue();
 		internal abstract FieldSignature FieldSignature { get; }
 
@@ -190,9 +190,9 @@ namespace IKVM.Reflection
 			get { return field.__FieldOffset; }
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return field.__FieldMarshal; }
+			return field.__TryGetFieldMarshal(out fieldMarshal);
 		}
 
 		public override Object GetRawConstantValue()

reflect/GenericWrappers.cs

@@ -340,9 +340,9 @@ namespace IKVM.Reflection
 			get { return field.__FieldOffset; }
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return field.__FieldMarshal; }
+			return field.__TryGetFieldMarshal(out fieldMarshal);
 		}
 
 		public override FieldInfo __GetFieldOnTypeDefinition()
@@ -412,9 +412,9 @@ namespace IKVM.Reflection
 			return parameterInfo.__GetCustomModifiers().Bind(method);
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return parameterInfo.__FieldMarshal; }
+			return parameterInfo.__TryGetFieldMarshal(out fieldMarshal);
 		}
 
 		public override MemberInfo Member

reflect/MarshalSpec.cs

@@ -32,170 +32,95 @@ using IKVM.Reflection.Metadata;
 
 namespace IKVM.Reflection
 {
-	public sealed class FieldMarshal
+	public struct FieldMarshal
 	{
 		private const UnmanagedType NATIVE_TYPE_MAX = (UnmanagedType)0x50;
-		private readonly UnmanagedType unmanagedType;
-		private readonly UnmanagedType? arraySubType;
-		private readonly short? sizeParamIndex;
-		private readonly int? sizeConst;
-		private readonly VarEnum? safeArraySubType;
-		private readonly Type safeArrayUserDefinedSubType;
-		private readonly int? iidParameterIndex;
-		private readonly string marshalType;
-		private readonly string marshalCookie;
-		private readonly Type marshalTypeRef;
+		public UnmanagedType UnmanagedType;
+		public UnmanagedType? ArraySubType;
+		public short? SizeParamIndex;
+		public int? SizeConst;
+		public VarEnum? SafeArraySubType;
+		public Type SafeArrayUserDefinedSubType;
+		public int? IidParameterIndex;
+		public string MarshalType;
+		public string MarshalCookie;
+		public Type MarshalTypeRef;
 
-		public UnmanagedType UnmanagedType
-		{
-			get { return unmanagedType; }
-		}
-
-		public UnmanagedType? ArraySubType
-		{
-			get { return arraySubType; }
-		}
-
-		public short? SizeParamIndex
-		{
-			get { return sizeParamIndex; }
-		}
-
-		public int? SizeConst
-		{
-			get { return sizeConst; }
-		}
-
-		public VarEnum? SafeArraySubType
-		{
-			get { return safeArraySubType; }
-		}
-
-		public Type SafeArrayUserDefinedSubType
-		{
-			get { return safeArrayUserDefinedSubType; }
-		}
-
-		public int? IidParameterIndex
-		{
-			get { return iidParameterIndex; }
-		}
-
-		public string MarshalType
-		{
-			get { return marshalType; }
-		}
-
-		public string MarshalCookie
-		{
-			get { return marshalCookie; }
-		}
-
-		public Type MarshalTypeRef
-		{
-			get { return marshalTypeRef; }
-		}
-
-		private FieldMarshal(UnmanagedType unmanagedType, UnmanagedType? arraySubType, short? sizeParamIndex,
-			int? sizeConst, VarEnum? safeArraySubType, Type safeArrayUserDefinedSubType, int? iidParameterIndex,
-			string marshalType, string marshalCookie, Type marshalTypeRef)
-		{
-			this.unmanagedType = unmanagedType;
-			this.arraySubType = arraySubType;
-			this.sizeParamIndex = sizeParamIndex;
-			this.sizeConst = sizeConst;
-			this.safeArraySubType = safeArraySubType;
-			this.safeArrayUserDefinedSubType = safeArrayUserDefinedSubType;
-			this.iidParameterIndex = iidParameterIndex;
-			this.marshalType = marshalType;
-			this.marshalCookie = marshalCookie;
-			this.marshalTypeRef = marshalTypeRef;
-		}
-
-		internal static FieldMarshal ReadFieldMarshal(Module module, int token)
+		internal static bool ReadFieldMarshal(Module module, int token, out FieldMarshal fm)
 		{
+			fm = new FieldMarshal();
 			foreach (int i in module.FieldMarshal.Filter(token))
 			{
 				ByteReader blob = module.GetBlob(module.FieldMarshal.records[i].NativeType);
-				UnmanagedType unmanagedType = (UnmanagedType)blob.ReadCompressedInt();
-				UnmanagedType? arraySubType = null;
-				short? sizeParamIndex = null;
-				int? sizeConst = null;
-				VarEnum? safeArraySubType = null;
-				Type safeArrayUserDefinedSubType = null;
-				int? iidParameterIndex = null;
-				string marshalType = null;
-				string marshalCookie = null;
-				Type marshalTypeRef = null;
-				if (unmanagedType == UnmanagedType.LPArray)
+				fm.UnmanagedType = (UnmanagedType)blob.ReadCompressedInt();
+				if (fm.UnmanagedType == UnmanagedType.LPArray)
 				{
-					arraySubType = (UnmanagedType)blob.ReadCompressedInt();
-					if (arraySubType == NATIVE_TYPE_MAX)
+					fm.ArraySubType = (UnmanagedType)blob.ReadCompressedInt();
+					if (fm.ArraySubType == NATIVE_TYPE_MAX)
 					{
-						arraySubType = null;
+						fm.ArraySubType = null;
 					}
 					if (blob.Length != 0)
 					{
-						sizeParamIndex = (short)blob.ReadCompressedInt();
+						fm.SizeParamIndex = (short)blob.ReadCompressedInt();
 						if (blob.Length != 0)
 						{
-							sizeConst = blob.ReadCompressedInt();
+							fm.SizeConst = blob.ReadCompressedInt();
 							if (blob.Length != 0 && blob.ReadCompressedInt() == 0)
 							{
-								sizeParamIndex = null;
+								fm.SizeParamIndex = null;
 							}
 						}
 					}
 				}
-				else if (unmanagedType == UnmanagedType.SafeArray)
+				else if (fm.UnmanagedType == UnmanagedType.SafeArray)
 				{
 					if (blob.Length != 0)
 					{
-						safeArraySubType = (VarEnum)blob.ReadCompressedInt();
+						fm.SafeArraySubType = (VarEnum)blob.ReadCompressedInt();
 						if (blob.Length != 0)
 						{
-							safeArrayUserDefinedSubType = ReadType(module, blob);
+							fm.SafeArrayUserDefinedSubType = ReadType(module, blob);
 						}
 					}
 				}
-				else if (unmanagedType == UnmanagedType.ByValArray)
+				else if (fm.UnmanagedType == UnmanagedType.ByValArray)
 				{
-					sizeConst = blob.ReadCompressedInt();
+					fm.SizeConst = blob.ReadCompressedInt();
 					if (blob.Length != 0)
 					{
-						arraySubType = (UnmanagedType)blob.ReadCompressedInt();
+						fm.ArraySubType = (UnmanagedType)blob.ReadCompressedInt();
 					}
 				}
-				else if (unmanagedType == UnmanagedType.ByValTStr)
+				else if (fm.UnmanagedType == UnmanagedType.ByValTStr)
 				{
-					sizeConst = blob.ReadCompressedInt();
+					fm.SizeConst = blob.ReadCompressedInt();
 				}
-				else if (unmanagedType == UnmanagedType.Interface
-					|| unmanagedType == UnmanagedType.IDispatch
-					|| unmanagedType == UnmanagedType.IUnknown)
+				else if (fm.UnmanagedType == UnmanagedType.Interface
+					|| fm.UnmanagedType == UnmanagedType.IDispatch
+					|| fm.UnmanagedType == UnmanagedType.IUnknown)
 				{
 					if (blob.Length != 0)
 					{
-						iidParameterIndex = blob.ReadCompressedInt();
+						fm.IidParameterIndex = blob.ReadCompressedInt();
 					}
 				}
-				else if (unmanagedType == UnmanagedType.CustomMarshaler)
+				else if (fm.UnmanagedType == UnmanagedType.CustomMarshaler)
 				{
 					blob.ReadCompressedInt();
 					blob.ReadCompressedInt();
-					marshalType = ReadString(blob);
-					marshalCookie = ReadString(blob);
+					fm.MarshalType = ReadString(blob);
+					fm.MarshalCookie = ReadString(blob);
 
-					TypeNameParser parser = TypeNameParser.Parse(marshalType, false);
+					TypeNameParser parser = TypeNameParser.Parse(fm.MarshalType, false);
 					if (!parser.Error)
 					{
-						marshalTypeRef = parser.GetType(module.universe, module.Assembly, false, marshalType, false, false);
+						fm.MarshalTypeRef = parser.GetType(module.universe, module.Assembly, false, fm.MarshalType, false, false);
 					}
 				}
-				return new FieldMarshal(unmanagedType, arraySubType, sizeParamIndex, sizeConst, safeArraySubType,
-					safeArrayUserDefinedSubType, iidParameterIndex, marshalType, marshalCookie, marshalTypeRef);
+				return true;
 			}
-			return null;
+			return false;
 		}
 
 		internal CustomAttributeData ToCustomAttribute(Module module)
@@ -205,44 +130,44 @@ namespace IKVM.Reflection
 			Type typeofVarEnum = module.universe.System_Runtime_InteropServices_VarEnum;
 			Type typeofType = module.universe.System_Type;
 			List<CustomAttributeNamedArgument> named = new List<CustomAttributeNamedArgument>();
-			if (arraySubType != null)
+			if (ArraySubType != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "ArraySubType", typeofUnmanagedType, arraySubType.Value);
+				AddNamedArgument(named, typeofMarshalAs, "ArraySubType", typeofUnmanagedType, ArraySubType.Value);
 			}
-			if (sizeParamIndex != null)
+			if (SizeParamIndex != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "SizeParamIndex", module.universe.System_Int16, sizeParamIndex.Value);
+				AddNamedArgument(named, typeofMarshalAs, "SizeParamIndex", module.universe.System_Int16, SizeParamIndex.Value);
 			}
-			if (sizeConst != null)
+			if (SizeConst != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "SizeConst", module.universe.System_Int32, sizeConst.Value);
+				AddNamedArgument(named, typeofMarshalAs, "SizeConst", module.universe.System_Int32, SizeConst.Value);
 			}
-			if (safeArraySubType != null)
+			if (SafeArraySubType != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "SafeArraySubType", typeofVarEnum, safeArraySubType.Value);
+				AddNamedArgument(named, typeofMarshalAs, "SafeArraySubType", typeofVarEnum, SafeArraySubType.Value);
 			}
-			if (safeArrayUserDefinedSubType != null)
+			if (SafeArrayUserDefinedSubType != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "SafeArrayUserDefinedSubType", typeofType, safeArrayUserDefinedSubType);
+				AddNamedArgument(named, typeofMarshalAs, "SafeArrayUserDefinedSubType", typeofType, SafeArrayUserDefinedSubType);
 			}
-			if (iidParameterIndex != null)
+			if (IidParameterIndex != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "IidParameterIndex", module.universe.System_Int32, iidParameterIndex.Value);
+				AddNamedArgument(named, typeofMarshalAs, "IidParameterIndex", module.universe.System_Int32, IidParameterIndex.Value);
 			}
-			if (marshalType != null)
+			if (MarshalType != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "MarshalType", module.universe.System_String, marshalType);
+				AddNamedArgument(named, typeofMarshalAs, "MarshalType", module.universe.System_String, MarshalType);
 			}
-			if (marshalTypeRef != null)
+			if (MarshalTypeRef != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "MarshalTypeRef", module.universe.System_Type, marshalTypeRef);
+				AddNamedArgument(named, typeofMarshalAs, "MarshalTypeRef", module.universe.System_Type, MarshalTypeRef);
 			}
-			if (marshalCookie != null)
+			if (MarshalCookie != null)
 			{
-				AddNamedArgument(named, typeofMarshalAs, "MarshalCookie", module.universe.System_String, marshalCookie);
+				AddNamedArgument(named, typeofMarshalAs, "MarshalCookie", module.universe.System_String, MarshalCookie);
 			}
 			ConstructorInfo constructor = typeofMarshalAs.GetPseudoCustomAttributeConstructor(typeofUnmanagedType);
-			return new CustomAttributeData(module, constructor, new object[] { unmanagedType }, named);
+			return new CustomAttributeData(module, constructor, new object[] { UnmanagedType }, named);
 		}
 
 		private static void AddNamedArgument(List<CustomAttributeNamedArgument> list, Type attributeType, string fieldName, Type valueType, object value)

reflect/Missing.cs

@@ -730,9 +730,9 @@ namespace IKVM.Reflection
 					: method.signature.GetParameterCustomModifiers(method, index);
 			}
 
-			public override FieldMarshal __FieldMarshal
+			public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 			{
-				get { return Forwarder.__FieldMarshal; }
+				return Forwarder.__TryGetFieldMarshal(out fieldMarshal);
 			}
 
 			public override MemberInfo Member
@@ -980,9 +980,9 @@ namespace IKVM.Reflection
 			get { return Forwarder.__FieldOffset; }
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return Forwarder.__FieldMarshal; }
+			return forwarder.__TryGetFieldMarshal(out fieldMarshal);
 		}
 
 		public override object GetRawConstantValue()

reflect/ParameterInfo.cs

@@ -59,7 +59,7 @@ namespace IKVM.Reflection
 		public abstract int Position { get; }
 		public abstract object RawDefaultValue { get; }
 		public abstract CustomModifiers __GetCustomModifiers();
-		public abstract FieldMarshal __FieldMarshal { get; }
+		public abstract bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal);
 		public abstract MemberInfo Member { get; }
 		public abstract int MetadataToken { get; }
 		internal abstract Module Module { get; }
@@ -151,9 +151,9 @@ namespace IKVM.Reflection
 			return forward.__GetCustomModifiers();
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return forward.__FieldMarshal; }
+			return forward.__TryGetFieldMarshal(out fieldMarshal);
 		}
 
 		public override MemberInfo Member

reflect/PropertyInfo.cs

@@ -91,9 +91,10 @@ namespace IKVM.Reflection
 				return property.PropertySignature.GetParameterCustomModifiers(parameter);
 			}
 
-			public override FieldMarshal __FieldMarshal
+			public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 			{
-				get { return null; }
+				fieldMarshal = new FieldMarshal();
+				return false;
 			}
 
 			public override MemberInfo Member

reflect/Reader/Field.cs

@@ -114,9 +114,9 @@ namespace IKVM.Reflection.Reader
 			}
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return FieldMarshal.ReadFieldMarshal(module, this.MetadataToken); }
+			return FieldMarshal.ReadFieldMarshal(module, this.MetadataToken, out fieldMarshal);
 		}
 
 		internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
@@ -124,8 +124,8 @@ namespace IKVM.Reflection.Reader
 			List<CustomAttributeData> list = module.GetCustomAttributes(this.MetadataToken, attributeType);
 			if (attributeType == null || attributeType.IsAssignableFrom(module.universe.System_Runtime_InteropServices_MarshalAsAttribute))
 			{
-				FieldMarshal spec = FieldMarshal.ReadFieldMarshal(module, this.MetadataToken);
-				if (spec != null)
+				FieldMarshal spec;
+				if (__TryGetFieldMarshal(out spec))
 				{
 					list.Add(spec.ToCustomAttribute(module));
 				}

reflect/Reader/Method.cs

@@ -473,9 +473,9 @@ namespace IKVM.Reflection.Reader
 				: method.MethodSignature.GetParameterCustomModifiers(method, position);
 		}
 
-		public override FieldMarshal __FieldMarshal
+		public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 		{
-			get { return FieldMarshal.ReadFieldMarshal(this.Module, this.MetadataToken); }
+			return FieldMarshal.ReadFieldMarshal(this.Module, this.MetadataToken, out fieldMarshal);
 		}
 
 		public override MemberInfo Member

reflect/Type.cs

@@ -2369,9 +2369,10 @@ namespace IKVM.Reflection
 				return new CustomModifiers();
 			}
 
-			public override FieldMarshal __FieldMarshal
+			public override bool __TryGetFieldMarshal(out FieldMarshal fieldMarshal)
 			{
-				get { return null; }
+				fieldMarshal = new FieldMarshal();
+				return false;
 			}
 
 			public override MemberInfo Member