Remove expensive calls to System.Type.IsByRef

Author: CallumDev

src/WattleScript.Interpreter/DataTypes/DynValue.cs

@@ -1051,7 +1051,7 @@ public object ToObject()
 		public object ToObject(Type desiredType)
 		{
 			//Contract.Requires(desiredType != null);
-			return WattleScript.Interpreter.Interop.Converters.ScriptToClrConversions.DynValueToObjectOfType(this, desiredType, null, false);
+			return WattleScript.Interpreter.Interop.Converters.ScriptToClrConversions.DynValueToObjectOfType(this, desiredType, false, null, false);
 		}
 
 		/// <summary>

src/WattleScript.Interpreter/Interop/BasicDescriptors/ParameterDescriptor.cs

@@ -45,7 +45,11 @@ public sealed class ParameterDescriptor
 		/// Gets the original type of the parameter before any restriction has been applied.
 		/// </summary>
 		public Type OriginalType { get { return m_OriginalType ?? Type; } }
-
+		
+		///
+		/// Gets the IsByRef result of the Type
+		/// 
+		public bool TypeByRef { get; private set; }
 
 		/// <summary>
 		/// If the type got restricted, the original type before the restriction.
@@ -72,6 +76,7 @@ public ParameterDescriptor(string name, Type type, bool hasDefaultValue = false,
 			IsOut = isOut;
 			IsRef = isRef;
 			IsVarArgs = isVarArgs;
+			TypeByRef = type.IsByRef;
 		}
 
 		/// <summary>
@@ -95,6 +100,7 @@ public ParameterDescriptor(string name, Type type, bool hasDefaultValue, object
 			IsOut = isOut;
 			IsRef = isRef;
 			IsVarArgs = isVarArgs;
+			TypeByRef = type.IsByRef;
 
 			if (typeRestriction != null)
 			{
@@ -116,6 +122,7 @@ public ParameterDescriptor(ParameterInfo pi)
 			IsOut = pi.IsOut;
 			IsRef = pi.ParameterType.IsByRef;
 			IsVarArgs = (pi.ParameterType.IsArray && pi.GetCustomAttributes(typeof(ParamArrayAttribute), true).Any());
+			TypeByRef = pi.ParameterType.IsByRef;
 		}
 
 

src/WattleScript.Interpreter/Interop/Converters/ScriptToClrConversions.cs

@@ -186,10 +186,10 @@ internal static T DynValueToObject<T>(DynValue value, T defaultValue, bool isOpt
         /// <summary>
         /// Converts a DynValue to a CLR object of a specific type
         /// </summary>
-        internal static object DynValueToObjectOfType(DynValue value, Type desiredType, object defaultValue,
+        internal static object DynValueToObjectOfType(DynValue value, Type desiredType, bool typeByRef, object defaultValue,
             bool isOptional)
         {
-            if (desiredType.IsByRef)
+            if (typeByRef)
                 desiredType = desiredType.GetElementType();
 
             var converter =
@@ -320,9 +320,9 @@ internal static object DynValueToObjectOfType(DynValue value, Type desiredType,
         /// Implementation must follow that of DynValueToObjectOfType.. it's not very DRY in that sense.
         /// However here we are in perf-sensitive path.. TODO : double-check the gain and see if a DRY impl is better.
         /// </summary>
-        internal static int DynValueToObjectOfTypeWeight(DynValue value, Type desiredType, bool isOptional)
+        internal static int DynValueToObjectOfTypeWeight(DynValue value, Type desiredType, bool desiredByRef, bool isOptional)
         {
-            if (desiredType.IsByRef)
+            if (desiredByRef)
                 desiredType = desiredType.GetElementType();
 
             var customConverter =

src/WattleScript.Interpreter/Interop/Converters/TableConversions.cs

@@ -140,8 +140,8 @@ internal static object ConvertTableToDictionaryOfGenericType(Type dictionaryType
 
 			foreach (var kvp in table.Pairs)
 			{
-				object key = ScriptToClrConversions.DynValueToObjectOfType(kvp.Key, keyType, null, false);
-				object val = ScriptToClrConversions.DynValueToObjectOfType(kvp.Value, valueType, null, false);
+				object key = ScriptToClrConversions.DynValueToObjectOfType(kvp.Key, keyType, false, null, false);
+				object val = ScriptToClrConversions.DynValueToObjectOfType(kvp.Value, valueType, false, null, false);
 
 				dic.Add(key, val);
 			}
@@ -159,7 +159,7 @@ internal static object ConvertTableToArrayOfGenericType(Type arrayType, Type ite
 			for (int i = 1, l = table.Length; i <= l; i++)
 			{
 				DynValue v = table.Get(i);
-				object o = ScriptToClrConversions.DynValueToObjectOfType(v, itemType, null, false);
+				object o = ScriptToClrConversions.DynValueToObjectOfType(v, itemType, false, null, false);
 				lst.Add(o);
 			}
 
@@ -188,7 +188,7 @@ internal static object ConvertTableToListOfGenericType(Type listType, Type itemT
 			for (int i = 1, l = table.Length; i <= l; i++)
 			{
 				DynValue v = table.Get(i);
-				object o = ScriptToClrConversions.DynValueToObjectOfType(v, itemType, null, false);
+				object o = ScriptToClrConversions.DynValueToObjectOfType(v, itemType, false, null, false);
 				lst.Add(o);
 			}
 

src/WattleScript.Interpreter/Interop/PropertyTableAssigner.cs

@@ -167,7 +167,7 @@ private bool TryAssignProperty(object obj, string name, DynValue value)
 					else
 					{
 						o = Interop.Converters.ScriptToClrConversions.DynValueToObjectOfType(value,
-							pi.PropertyType, null, false);
+							pi.PropertyType, false,null, false);
 					}
 
 					pi.GetSetMethod(true).Invoke(obj, new object[] { o });

src/WattleScript.Interpreter/Interop/StandardDescriptors/HardwiredDescriptors/HardwiredMemberDescriptor.cs

@@ -33,7 +33,7 @@ public DynValue GetValue(Script script, object obj)
 		public void SetValue(Script script, object obj, DynValue value)
 		{
 			this.CheckAccess(MemberDescriptorAccess.CanWrite, obj);
-			object v = ScriptToClrConversions.DynValueToObjectOfType(value, MemberType, null, false);
+			object v = ScriptToClrConversions.DynValueToObjectOfType(value, MemberType, false, null, false);
 			SetValueImpl(script, obj, v);
 		}
 

src/WattleScript.Interpreter/Interop/StandardDescriptors/MemberDescriptors/ArrayMemberDescriptor.cs

@@ -58,7 +58,7 @@ private static object ArrayIndexerSet(object arrayObj, ScriptExecutionContext ct
 
 			Type elemType = array.GetType().GetElementType();
 
-			object objValue = ScriptToClrConversions.DynValueToObjectOfType(value, elemType, null, false);
+			object objValue = ScriptToClrConversions.DynValueToObjectOfType(value, elemType, false, null, false);
 
 			array.SetValue(objValue, indices);
 

src/WattleScript.Interpreter/Interop/StandardDescriptors/MemberDescriptors/FunctionMemberDescriptorBase.cs

@@ -208,7 +208,7 @@ protected virtual object[] BuildArgumentList(Script script, object obj, ScriptEx
 					for (int ii = 0; ii < extraArgs.Count; ii++)
 					{
 						vararg.SetValue(ScriptToClrConversions.DynValueToObjectOfType(extraArgs[ii], VarArgsElementType,
-						null, false), ii);
+						false, null, false), ii);
 					}
 
 					pars[i] = vararg;
@@ -219,7 +219,7 @@ protected virtual object[] BuildArgumentList(Script script, object obj, ScriptEx
 				{
 					var arg = args.RawGet(j, false);
 					pars[i] = ScriptToClrConversions.DynValueToObjectOfType(arg, parameters[i].Type,
-						parameters[i].DefaultValue, parameters[i].HasDefaultValue);
+						parameters[i].TypeByRef, parameters[i].DefaultValue, parameters[i].HasDefaultValue);
 					j += 1;
 				}
 			}

src/WattleScript.Interpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/FieldMemberDescriptor.cs

@@ -159,7 +159,7 @@ public void SetValue(Script script, object obj, DynValue v)
 			if (IsReadonly || IsConst)
 				throw new ScriptRuntimeException("userdata field '{0}.{1}' cannot be written to.", this.FieldInfo.DeclaringType.Name, this.Name);
 
-			object value = ScriptToClrConversions.DynValueToObjectOfType(v, this.FieldInfo.FieldType, null, false);
+			object value = ScriptToClrConversions.DynValueToObjectOfType(v, this.FieldInfo.FieldType, false, null, false);
 
 			try
 			{

src/WattleScript.Interpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/OverloadedMethodMemberDescriptor.cs

@@ -403,9 +403,9 @@ private int CalcScoreForOverload(ScriptExecutionContext context, CallbackArgumen
 		private static int CalcScoreForSingleArgument(ParameterDescriptor desc, Type parameterType, DynValue arg, bool isOptional)
 		{
 			int score = ScriptToClrConversions.DynValueToObjectOfTypeWeight(arg,
-				parameterType, isOptional);
+				parameterType, desc.TypeByRef, isOptional);
 
-			if (parameterType.IsByRef || desc.IsOut || desc.IsRef)
+			if (desc.TypeByRef || desc.IsOut || desc.IsRef)
 				score = Math.Max(0, score + ScriptToClrConversions.WEIGHT_BYREF_BONUSMALUS);
 
 			return score;