Support Unmanaged call conv

gagmeng · Jun 29, 2020 · 651e304 · 651e304
1 parent f895c90
commit 651e304
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/DotNet/CallingConvention.cs b/src/DotNet/CallingConvention.cs
@@ -26,7 +26,7 @@ public enum CallingConvention : byte {
 		LocalSig		= 0x7,
 		/// <summary/>
 		Property		= 0x8,
-		/// <summary/>
+		/// <summary>Unmanaged calling convention encoded as modopts</summary>
 		Unmanaged		= 0x9,
 		/// <summary>generic method instantiation</summary>
 		GenericInst		= 0xA,

diff --git a/src/DotNet/SigComparer.cs b/src/DotNet/SigComparer.cs
@@ -2218,6 +2218,7 @@ public bool Equals(CallingConventionSig a, CallingConventionSig b) {
 				case CallingConvention.VarArg:
 				case CallingConvention.Property:
 				case CallingConvention.NativeVarArg:
+				case CallingConvention.Unmanaged:
 					MethodBaseSig ma = a as MethodBaseSig, mb = b as MethodBaseSig;
 					result = !(ma is null) && !(mb is null) && Equals(ma, mb);
 					break;
@@ -2237,7 +2238,6 @@ public bool Equals(CallingConventionSig a, CallingConventionSig b) {
 					result = !(ga is null) && !(gb is null) && Equals(ga, gb);
 					break;
 
-				case CallingConvention.Unmanaged:
 				default:
 					result = false;
 					break;
@@ -2269,6 +2269,7 @@ public int GetHashCode(CallingConventionSig a) {
 			case CallingConvention.VarArg:
 			case CallingConvention.Property:
 			case CallingConvention.NativeVarArg:
+			case CallingConvention.Unmanaged:
 				var ma = a as MethodBaseSig;
 				hash = ma is null ? 0 : GetHashCode(ma);
 				break;
@@ -2288,7 +2289,6 @@ public int GetHashCode(CallingConventionSig a) {
 				hash = ga is null ? 0 : GetHashCode(ga);
 				break;
 
-			case CallingConvention.Unmanaged:
 			default:
 				hash = GetHashCode_CallingConvention(a);
 				break;

diff --git a/src/DotNet/SignatureReader.cs b/src/DotNet/SignatureReader.cs
@@ -430,6 +430,7 @@ CallingConventionSig ReadSig() {
 			case CallingConvention.FastCall:
 			case CallingConvention.VarArg:
 			case CallingConvention.NativeVarArg:
+			case CallingConvention.Unmanaged:
 				result = ReadMethod(callingConvention);
 				break;
 
@@ -449,7 +450,6 @@ CallingConventionSig ReadSig() {
 				result = ReadGenericInstMethod(callingConvention);
 				break;
 
-			case CallingConvention.Unmanaged:
 			default:
 				result = null;
 				break;