[Ikvm-commit] ikvm/runtime LambdaMetafactory.cs,1.4,1.5

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/runtime
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26568

Modified Files:
	LambdaMetafactory.cs 
Log Message:
Fixed serialization issue.

Index: LambdaMetafactory.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/runtime/LambdaMetafactory.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LambdaMetafactory.cs	8 Jul 2014 11:21:12 -0000	1.4
--- LambdaMetafactory.cs	8 Jul 2014 13:22:29 -0000	1.5
***************
*** 193,197 ****
  				tb.AddInterfaceImplementation(marker.TypeAsBaseType);
  			}
! 			ctor = CreateConstructorAndDispatch(context, cpi.GetArgTypes(), tb, interfaceMethod, implParameters, samMethodType, implMethod, instantiatedMethodType, serializable);
  			AddDefaultInterfaceMethods(context, methodList, tb);
  			return true;
--- 193,197 ----
  				tb.AddInterfaceImplementation(marker.TypeAsBaseType);
  			}
! 			ctor = CreateConstructorAndDispatch(context, interfaceType, cpi.GetArgTypes(), tb, interfaceMethod, implParameters, samMethodType, implMethod, instantiatedMethodType, serializable);
  			AddDefaultInterfaceMethods(context, methodList, tb);
  			return true;
***************
*** 357,361 ****
  		}
  
! 		private static MethodBuilder CreateConstructorAndDispatch(DynamicTypeWrapper.FinishContext context, TypeWrapper[] args, TypeBuilder tb,
  			MethodWrapper interfaceMethod, TypeWrapper[] implParameters, ClassFile.ConstantPoolItemMethodType samMethodType, ClassFile.ConstantPoolItemMethodHandle implMethod,
  			ClassFile.ConstantPoolItemMethodType instantiatedMethodType, bool serializable)
--- 357,361 ----
  		}
  
! 		private static MethodBuilder CreateConstructorAndDispatch(DynamicTypeWrapper.FinishContext context, TypeWrapper interfaceType, TypeWrapper[] args, TypeBuilder tb,
  			MethodWrapper interfaceMethod, TypeWrapper[] implParameters, ClassFile.ConstantPoolItemMethodType samMethodType, ClassFile.ConstantPoolItemMethodHandle implMethod,
  			ClassFile.ConstantPoolItemMethodType instantiatedMethodType, bool serializable)
***************
*** 554,558 ****
  				ilgen = CodeEmitter.Create(writeReplace);
  				context.TypeWrapper.EmitClassLiteral(ilgen);
! 				ilgen.Emit(OpCodes.Ldstr, interfaceMethod.DeclaringType.Name.Replace('.', '/'));
  				ilgen.Emit(OpCodes.Ldstr, interfaceMethod.Name);
  				ilgen.Emit(OpCodes.Ldstr, interfaceMethod.Signature.Replace('.', '/'));
--- 554,558 ----
  				ilgen = CodeEmitter.Create(writeReplace);
  				context.TypeWrapper.EmitClassLiteral(ilgen);
! 				ilgen.Emit(OpCodes.Ldstr, interfaceType.Name.Replace('.', '/'));
  				ilgen.Emit(OpCodes.Ldstr, interfaceMethod.Name);
  				ilgen.Emit(OpCodes.Ldstr, interfaceMethod.Signature.Replace('.', '/'));