Merge pull request #99 from mono/bug52333

Bug 52333 - Debugger applies rounding when casting float values to int

Author: slluis

Mono.Debugging.Soft/SoftDebuggerAdaptor.cs

@@ -202,53 +202,60 @@ public override object TryConvert (EvaluationContext ctx, object obj, object tar
 			return null;
 		}
 
+		static Dictionary<string, TypeCastDelegate> typeCastDelegatesCache = new Dictionary<string, TypeCastDelegate> ();
 		static TypeCastDelegate GenerateTypeCastDelegate (string methodName, Type fromType, Type toType)
 		{
-			var argTypes = new [] { typeof (object) };
-			var method = new DynamicMethod (methodName, typeof (object), argTypes, true);
-			ILGenerator il = method.GetILGenerator ();
-			ConstructorInfo ctorInfo;
-			MethodInfo methodInfo;
-			OpCode conv;
-
-			il.Emit (OpCodes.Ldarg_0);
-			il.Emit (OpCodes.Unbox_Any, fromType);
-
-			if (fromType.IsSubclassOf (typeof (Nullable))) {
-				PropertyInfo propInfo = fromType.GetProperty ("Value");
-				methodInfo = propInfo.GetGetMethod ();
-
-				il.Emit (OpCodes.Stloc_0);
-				il.Emit (OpCodes.Ldloca_S);
-				il.Emit (OpCodes.Call, methodInfo);
-
-				fromType = methodInfo.ReturnType;
-			}
+			lock(typeCastDelegatesCache) {
+				TypeCastDelegate cached;
+				if (typeCastDelegatesCache.TryGetValue (methodName, out cached))
+					return cached;
+				var argTypes = new [] { typeof (object) };
+				var method = new DynamicMethod (methodName, typeof (object), argTypes, true);
+				ILGenerator il = method.GetILGenerator ();
+				ConstructorInfo ctorInfo;
+				MethodInfo methodInfo;
+				OpCode conv;
+
+				il.Emit (OpCodes.Ldarg_0);
+				il.Emit (OpCodes.Unbox_Any, fromType);
+
+				if (fromType.IsSubclassOf (typeof (Nullable))) {
+					PropertyInfo propInfo = fromType.GetProperty ("Value");
+					methodInfo = propInfo.GetGetMethod ();
+
+					il.Emit (OpCodes.Stloc_0);
+					il.Emit (OpCodes.Ldloca_S);
+					il.Emit (OpCodes.Call, methodInfo);
 
-			if (!convertOps.TryGetValue (toType, out conv)) {
-				argTypes = new [] { fromType };
+					fromType = methodInfo.ReturnType;
+				}
 
-				if (toType == typeof (string)) {
-					methodInfo = fromType.GetMethod ("ToString", new Type[0]);
-					il.Emit (OpCodes.Call, methodInfo);
-				} else if ((methodInfo = toType.GetMethod ("op_Explicit", argTypes)) != null) {
-					il.Emit (OpCodes.Call, methodInfo);
-				} else if ((methodInfo = toType.GetMethod ("op_Implicit", argTypes)) != null) {
-					il.Emit (OpCodes.Call, methodInfo);
-				} else if ((ctorInfo = toType.GetConstructor (argTypes)) != null) {
-					il.Emit (OpCodes.Call, ctorInfo);
+				if (!convertOps.TryGetValue (toType, out conv)) {
+					argTypes = new [] { fromType };
+
+					if (toType == typeof (string)) {
+						methodInfo = fromType.GetMethod ("ToString", new Type [0]);
+						il.Emit (OpCodes.Call, methodInfo);
+					} else if ((methodInfo = toType.GetMethod ("op_Explicit", argTypes)) != null) {
+						il.Emit (OpCodes.Call, methodInfo);
+					} else if ((methodInfo = toType.GetMethod ("op_Implicit", argTypes)) != null) {
+						il.Emit (OpCodes.Call, methodInfo);
+					} else if ((ctorInfo = toType.GetConstructor (argTypes)) != null) {
+						il.Emit (OpCodes.Call, ctorInfo);
+					} else {
+						// No idea what else to try...
+						throw new InvalidCastException ();
+					}
 				} else {
-					// No idea what else to try...
-					throw new InvalidCastException ();
+					il.Emit (conv);
 				}
-			} else {
-				il.Emit (conv);
-			}
 
-			il.Emit (OpCodes.Box, toType);
-			il.Emit (OpCodes.Ret);
-
-			return (TypeCastDelegate) method.CreateDelegate (typeof (TypeCastDelegate));
+				il.Emit (OpCodes.Box, toType);
+				il.Emit (OpCodes.Ret);
+				cached = (TypeCastDelegate)method.CreateDelegate (typeof (TypeCastDelegate));
+				typeCastDelegatesCache [methodName] = cached;
+				return cached;
+			}
 		}
 
 		static object DynamicCast (object value, Type target)
@@ -391,46 +398,7 @@ public override object TryCast (EvaluationContext ctx, object val, object type)
 							if (val == null)
 								return null;
 
-							object res;
-
-							try {
-								if (tt == typeof (bool))
-									res = System.Convert.ToBoolean (val);
-								else if (tt == typeof (byte))
-									res = System.Convert.ToByte (val);
-								else if (tt == typeof (sbyte))
-									res = System.Convert.ToSByte (val);
-								else if (tt == typeof (char))
-									res = System.Convert.ToChar (val);
-								else if (tt == typeof (short))
-									res = System.Convert.ToInt16 (val);
-								else if (tt == typeof (ushort))
-									res = System.Convert.ToUInt16 (val);
-								else if (tt == typeof (int))
-									res = System.Convert.ToInt32 (val);
-								else if (tt == typeof (uint))
-									res = System.Convert.ToUInt32 (val);
-								else if (tt == typeof (long))
-									res = System.Convert.ToInt64 (val);
-								else if (tt == typeof (ulong))
-									res = System.Convert.ToUInt64 (val);
-								else if (tt == typeof (float))
-									res = System.Convert.ToSingle (val);
-								else if (tt == typeof (double))
-									res = System.Convert.ToDouble (val);
-								else if (tt == typeof (decimal))
-									res = System.Convert.ToDecimal (val);
-								else if (tt == typeof (string))
-									res = System.Convert.ToString (val);
-								else if (tt == typeof (DateTime))
-									res = System.Convert.ToDateTime (val);
-								else
-									res = val;
-							} catch {
-								res = DynamicCast (val, tt);
-							}
-
-							return CreateValue (ctx, res);
+							return CreateValue (ctx, DynamicCast (val, tt));
 						}
 
 						fromType = (TypeMirror) ForceLoadType (ctx, ((Type) valueType).FullName);