NH-3964 - cache other reflections which should be cached.

Author: fredericDelaporte

src/NHibernate/Bytecode/EmitUtil.cs

@@ -188,25 +188,25 @@ public static void EmitLoadType(ILGenerator il, System.Type type)
 			il.Emit(OpCodes.Call, typeof(System.Type).GetMethod("GetTypeFromHandle"));
 		}
 
+		private static readonly MethodInfo GetMethodFromHandle = typeof(MethodBase).GetMethod(
+			"GetMethodFromHandle", new System.Type[] { typeof(RuntimeMethodHandle) });
+
 		public static void EmitLoadMethodInfo(ILGenerator il, MethodInfo methodInfo)
 		{
 			il.Emit(OpCodes.Ldtoken, methodInfo);
-			il.Emit(
-				OpCodes.Call,
-				typeof(MethodBase).GetMethod(
-					"GetMethodFromHandle", new System.Type[] {typeof(RuntimeMethodHandle)}));
+			il.Emit(OpCodes.Call, GetMethodFromHandle);
 			il.Emit(OpCodes.Castclass, typeof(MethodInfo));
 		}
 
-		public static void EmitCreateDelegateInstance(ILGenerator il, System.Type delegateType, MethodInfo methodInfo)
-		{
-			MethodInfo createDelegate = typeof(Delegate).GetMethod(
+		private static readonly MethodInfo CreateDelegate = typeof(Delegate).GetMethod(
 				"CreateDelegate", BindingFlags.Static | BindingFlags.Public | BindingFlags.ExactBinding, null,
-				new System.Type[] {typeof(System.Type), typeof(MethodInfo)}, null);
+				new System.Type[] { typeof(System.Type), typeof(MethodInfo) }, null);
 
+		public static void EmitCreateDelegateInstance(ILGenerator il, System.Type delegateType, MethodInfo methodInfo)
+		{
 			EmitLoadType(il, delegateType);
 			EmitLoadMethodInfo(il, methodInfo);
-			il.EmitCall(OpCodes.Call, createDelegate, null);
+			il.EmitCall(OpCodes.Call, CreateDelegate, null);
 			il.Emit(OpCodes.Castclass, delegateType);
 		}
 	}

src/NHibernate/Bytecode/Lightweight/ReflectionOptimizer.cs

@@ -118,6 +118,9 @@ private static void EmitCastToReference(ILGenerator il, System.Type type)
 			}
 		}
 
+		private static readonly MethodInfo GetterCallbackInvoke = typeof (GetterCallback).GetMethod(
+			"Invoke", new[] { typeof (object), typeof (int) });
+
 		/// <summary>
 		/// Generates a dynamic method on the given type.
 		/// </summary>
@@ -163,8 +166,7 @@ private GetPropertyValuesInvoker GenerateGetPropertyValuesMethod(IGetter[] gette
 				else
 				{
 					// using the getter itself via a callback
-					MethodInfo invokeMethod = typeof (GetterCallback).GetMethod("Invoke",
-					                                                            new[] {typeof (object), typeof (int)});
+					MethodInfo invokeMethod = GetterCallbackInvoke;
 					il.Emit(OpCodes.Ldarg_1);
 					il.Emit(OpCodes.Ldarg_0);
 					il.Emit(OpCodes.Ldc_I4, i);
@@ -182,6 +184,9 @@ private GetPropertyValuesInvoker GenerateGetPropertyValuesMethod(IGetter[] gette
 			return (GetPropertyValuesInvoker) method.CreateDelegate(typeof (GetPropertyValuesInvoker));
 		}
 
+		private static readonly MethodInfo SetterCallbackInvoke = typeof(SetterCallback).GetMethod(
+			"Invoke", new[] { typeof(object), typeof(int), typeof(object) });
+
 		/// <summary>
 		/// Generates a dynamic method on the given type.
 		/// </summary>
@@ -224,8 +229,7 @@ private SetPropertyValuesInvoker GenerateSetPropertyValuesMethod(ISetter[] sette
 				else
 				{
 					// using the setter itself via a callback
-					MethodInfo invokeMethod = typeof (SetterCallback).GetMethod("Invoke",
-					                                                            new[] {typeof (object), typeof (int), typeof (object)});
+					MethodInfo invokeMethod = SetterCallbackInvoke;
 					il.Emit(OpCodes.Ldarg_2);
 					il.Emit(OpCodes.Ldarg_0);
 					il.Emit(OpCodes.Ldc_I4, i);

src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs

@@ -24,6 +24,7 @@ internal class DefaultMethodEmitter : IMethodBodyEmitter
 		private static readonly MethodInfo getMethodFromHandle = typeof (MethodBase).GetMethod("GetMethodFromHandle", new[] {typeof (RuntimeMethodHandle)});
 		private static readonly MethodInfo getTypeFromHandle = typeof(System.Type).GetMethod("GetTypeFromHandle");
 		private static readonly MethodInfo handlerMethod = typeof (IInterceptor).GetMethod("Intercept");
+		private static readonly MethodInfo getArguments = typeof(InvocationInfo).GetMethod("get_Arguments");
 
 		private static readonly ConstructorInfo infoConstructor = typeof (InvocationInfo).GetConstructor(new[]
 			{
@@ -118,7 +119,6 @@ private static void EmitBaseMethodCall(ILGenerator IL, MethodInfo method)
 		private static void SaveRefArguments(ILGenerator IL, ParameterInfo[] parameters)
 		{
 			// Save the arguments returned from the handler method
-			MethodInfo getArguments = typeof (InvocationInfo).GetMethod("get_Arguments");
 			IL.Emit(OpCodes.Ldloc_1);
 			IL.Emit(OpCodes.Call, getArguments);
 			IL.Emit(OpCodes.Stloc_0);

src/NHibernate/Proxy/DynamicProxy/ProxyImplementor.cs

@@ -18,6 +18,9 @@ internal class ProxyImplementor
 		                                                  MethodAttributes.SpecialName | MethodAttributes.NewSlot |
 		                                                  MethodAttributes.Virtual;
 
+		private static readonly MethodInfo OriginalSetter = typeof(IProxy).GetMethod("set_Interceptor");
+		private static readonly MethodInfo OriginalGetter = typeof(IProxy).GetMethod("get_Interceptor");
+
 		private FieldBuilder field;
 
 		public FieldBuilder InterceptorField
@@ -54,11 +57,8 @@ public void ImplementProxy(TypeBuilder typeBuilder)
 			IL.Emit(OpCodes.Stfld, field);
 			IL.Emit(OpCodes.Ret);
 
-			MethodInfo originalSetter = typeof (IProxy).GetMethod("set_Interceptor");
-			MethodInfo originalGetter = typeof (IProxy).GetMethod("get_Interceptor");
-
-			typeBuilder.DefineMethodOverride(setterMethod, originalSetter);
-			typeBuilder.DefineMethodOverride(getterMethod, originalGetter);
+			typeBuilder.DefineMethodOverride(setterMethod, OriginalSetter);
+			typeBuilder.DefineMethodOverride(getterMethod, OriginalGetter);
 		}
 	}
 }