Update hidden this param type, closes 0xd4d#392

gagmeng · Sep 14, 2020 · 3532ba7 · 3532ba7
1 parent 98ea089
commit 3532ba7
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/src/DotNet/ParameterList.cs b/src/DotNet/ParameterList.cs
@@ -118,10 +118,25 @@ internal void UpdateThisParameterType(TypeDef methodDeclaringType) {
 #endif
 			if (methodDeclaringType is null)
 				hiddenThisParameter.Type = null;
-			else if (methodDeclaringType.IsValueType)
-				hiddenThisParameter.Type = new ByRefSig(new ValueTypeSig(methodDeclaringType));
-			else
-				hiddenThisParameter.Type = new ClassSig(methodDeclaringType);
+			else {
+				bool isValueType = methodDeclaringType.IsValueType;
+				ClassOrValueTypeSig instSig;
+				if (isValueType)
+					instSig = new ValueTypeSig(methodDeclaringType);
+				else
+					instSig = new ClassSig(methodDeclaringType);
+				TypeSig thisTypeSig;
+				if (methodDeclaringType.HasGenericParameters) {
+					int gpCount = methodDeclaringType.GenericParameters.Count;
+					var genArgs = new List<TypeSig>(gpCount);
+					for (int i = 0; i < gpCount; i++)
+						genArgs.Add(new GenericVar(i, methodDeclaringType));
+					thisTypeSig = new GenericInstSig(instSig, genArgs);
+				}
+				else
+					thisTypeSig = instSig;
+				hiddenThisParameter.Type = isValueType ? new ByRefSig(thisTypeSig) : thisTypeSig;
+			}
 #if THREAD_SAFE
 			} finally { theLock.ExitWriteLock(); }
 #endif