[Ikvm-commit] ikvm/runtime compiler.cs,1.80.2.5,1.80.2.6

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

Update of /cvsroot/ikvm/ikvm/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv508

Modified Files:
      Tag: v0_36
	compiler.cs 
Log Message:
Fixed regression introduced in previous check in.

Index: compiler.cs
===================================================================
RCS file: /cvsroot/ikvm/ikvm/runtime/compiler.cs,v
retrieving revision 1.80.2.5
retrieving revision 1.80.2.6
diff -C2 -d -r1.80.2.5 -r1.80.2.6
*** compiler.cs	5 Nov 2008 07:52:02 -0000	1.80.2.5
--- compiler.cs	5 Nov 2008 09:07:05 -0000	1.80.2.6
***************
*** 3474,3478 ****
  				Profiler.Count("EmitDynamicGetfield");
  				ilGenerator.Emit(OpCodes.Call, ByteCodeHelperMethods.DynamicGetfield);
! 				EmitReturnTypeConversion(ilGenerator, fieldTypeWrapper);
  				break;
  			case NormalizedByteCode.__dynamic_putfield:
--- 3474,3478 ----
  				Profiler.Count("EmitDynamicGetfield");
  				ilGenerator.Emit(OpCodes.Call, ByteCodeHelperMethods.DynamicGetfield);
! 				EmitReturnTypeConversion(clazz, ilGenerator, fieldTypeWrapper);
  				break;
  			case NormalizedByteCode.__dynamic_putfield:
***************
*** 3483,3487 ****
  				Profiler.Count("EmitDynamicGetstatic");
  				ilGenerator.Emit(OpCodes.Call, ByteCodeHelperMethods.DynamicGetstatic);
! 				EmitReturnTypeConversion(ilGenerator, fieldTypeWrapper);
  				break;
  			case NormalizedByteCode.__dynamic_putstatic:
--- 3483,3487 ----
  				Profiler.Count("EmitDynamicGetstatic");
  				ilGenerator.Emit(OpCodes.Call, ByteCodeHelperMethods.DynamicGetstatic);
! 				EmitReturnTypeConversion(clazz, ilGenerator, fieldTypeWrapper);
  				break;
  			case NormalizedByteCode.__dynamic_putstatic:
***************
*** 3494,3498 ****
  	}
  
! 	private static void EmitReturnTypeConversion(ILGenerator ilgen, TypeWrapper typeWrapper)
  	{
  		if(typeWrapper.IsUnloadable)
--- 3494,3498 ----
  	}
  
! 	private static void EmitReturnTypeConversion(TypeWrapper context, ILGenerator ilgen, TypeWrapper typeWrapper)
  	{
  		if(typeWrapper.IsUnloadable)
***************
*** 3516,3520 ****
  		else
  		{
! 			typeWrapper.EmitCheckcast(null, ilgen);
  		}
  	}
--- 3516,3520 ----
  		else
  		{
! 			typeWrapper.EmitCheckcast(context, ilgen);
  		}
  	}
***************
*** 3574,3578 ****
  			ilGenerator.Emit(OpCodes.Ldloc, argarray);
  			ilGenerator.Emit(OpCodes.Call, helperMethod);
! 			EmitReturnTypeConversion(ilGenerator, retTypeWrapper);
  		}
  	}
--- 3574,3578 ----
  			ilGenerator.Emit(OpCodes.Ldloc, argarray);
  			ilGenerator.Emit(OpCodes.Call, helperMethod);
! 			EmitReturnTypeConversion(wrapper, ilGenerator, retTypeWrapper);
  		}
  	}