Generic methods and methods on generic type instance fixes.

1 files changed, 6 insertions, 2 deletions

diff --git a/reflect/GenericWrappers.cs b/reflect/GenericWrappers.cs
index 7d9d9bd1..ad2df635 100644
--- a/reflect/GenericWrappers.cs
+++ b/reflect/GenericWrappers.cs
@@ -171,9 +171,13 @@ namespace IKVM.Reflection
 				{
 					return this;
 				}
+				else if (declaringType.IsGenericType && !declaringType.IsGenericTypeDefinition)
+				{
+					return new GenericMethodInstance(declaringType, method, null);
+				}
 				else
 				{
-					return method.GetGenericMethodDefinition();
+					return method;
 				}
 			}
 			throw new InvalidOperationException();
@@ -228,7 +232,7 @@ namespace IKVM.Reflection
 			{
 				Writer.ByteBuffer spec = new Writer.ByteBuffer(10);
 				Signature.WriteMethodSpec(module, spec, methodArgs);
-				return module.ImportMethodSpec(method, spec);
+				return module.ImportMethodSpec(this, spec);
 			}
 		}