[ilasm] Add support for undocumented modopt/modreq using primitive types

2 files changed, 40 insertions, 1 deletions

diff --git a/mcs/class/PEAPI/Metadata.cs b/mcs/class/PEAPI/Metadata.cs
index 041b3392ef4..c2351247660 100644
--- a/mcs/class/PEAPI/Metadata.cs
+++ b/mcs/class/PEAPI/Metadata.cs
@@ -3314,6 +3314,7 @@ namespace PEAPI {
 
 		Type type;
 		Class cmodType;
+		PrimitiveTypeRef cmodPrimType;
 
 		/// <summary>
 		/// Create a new custom modifier for a type
@@ -3328,10 +3329,23 @@ namespace PEAPI {
 			this.cmodType = cmodType;
 		}
 
+		public CustomModifiedType(Type type, CustomModifier cmod, PrimitiveTypeRef cmodType)
+			: base((byte)cmod)
+		{
+			this.type = type;
+			this.cmodPrimType = cmodType;
+		}
+
 		internal sealed override void TypeSig(MemoryStream str) 
 		{
 			str.WriteByte(typeIndex);
-			MetaData.CompressNum(cmodType.TypeDefOrRefToken(),str);
+
+			if (cmodType != null) {
+				MetaData.CompressNum(cmodType.TypeDefOrRefToken(),str);
+			} else {
+				MetaData.CompressNum(cmodPrimType.TypeDefOrRefToken(),str);
+			}
+
 			type.TypeSig(str);
 		}
 
@@ -4470,6 +4484,26 @@ namespace PEAPI {
 
 	}
 
+	public class PrimitiveTypeRef : Type
+	{
+		PrimitiveType type;
+		MetaData metaData;
+
+		internal PrimitiveTypeRef(PrimitiveType type, MetaData md)
+			: base (0)
+		{
+			this.type = type;
+			this.metaData = md;
+		}
+
+		internal uint TypeDefOrRefToken()
+		{
+			uint cIx = type.GetTypeSpec (metaData).Row;
+			cIx = (cIx << 2) | 0x2;
+			return cIx;
+		}
+	}
+
 	/**************************************************************************/  
 	/// <summary>
 	/// Descriptor for an pointer (type * or type &)
diff --git a/mcs/class/PEAPI/PEAPI.cs b/mcs/class/PEAPI/PEAPI.cs
index 3043b3a6ea5..ec3cb410717 100644
--- a/mcs/class/PEAPI/PEAPI.cs
+++ b/mcs/class/PEAPI/PEAPI.cs
@@ -923,6 +923,11 @@ namespace PEAPI {
 			return file;
 		}
 
+		public PrimitiveTypeRef AddPrimitiveType (PrimitiveType type)
+		{
+			return new PrimitiveTypeRef (type, metaData);
+		}
+
 		/// <summary>
 		/// Add a manifest resource to this PEFile NOT YET IMPLEMENTED
 		/// </summary>