Add method index to MetaType for faster lookup

castleproject · Jan 19, 2021 · a1046cf · a1046cf
1 parent a8b97a8
commit a1046cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Castle.Core/DynamicProxy/Contributors/ClassProxySerializableContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/ClassProxySerializableContributor.cs
@@ -223,7 +223,7 @@ private bool VerifyIfBaseImplementsGetObjectData(Type baseType, MetaType model,
 				throw new ArgumentException(message);
 			}
 
-			getObjectData = model.Methods.FirstOrDefault(m => m.Method == getObjectDataMethod);
+			getObjectData = model.FindMethod(getObjectDataMethod);
 
 			serializationConstructor = baseType.GetConstructor(
 				BindingFlags.Instance | BindingFlags.Public |

diff --git a/src/Castle.Core/DynamicProxy/Generators/MetaType.cs b/src/Castle.Core/DynamicProxy/Generators/MetaType.cs
@@ -15,11 +15,13 @@
 namespace Castle.DynamicProxy.Generators
 {
 	using System.Collections.Generic;
+	using System.Reflection;
 
 	internal class MetaType
 	{
 		private readonly ICollection<MetaEvent> events = new TypeElementCollection<MetaEvent>();
 		private readonly ICollection<MetaMethod> methods = new TypeElementCollection<MetaMethod>();
+		private readonly Dictionary<MethodInfo, MetaMethod> methodsIndex = new Dictionary<MethodInfo, MetaMethod>();
 		private readonly ICollection<MetaProperty> properties = new TypeElementCollection<MetaProperty>();
 
 		public IEnumerable<MetaEvent> Events
@@ -46,11 +48,17 @@ public void AddEvent(MetaEvent @event)
 		public void AddMethod(MetaMethod method)
 		{
 			methods.Add(method);
+			methodsIndex.Add(method.Method, method);  // shouldn't get added twice
 		}
 
 		public void AddProperty(MetaProperty property)
 		{
 			properties.Add(property);
 		}
+
+		public MetaMethod FindMethod(MethodInfo method)
+		{
+			return methodsIndex.TryGetValue(method, out var metaMethod) ? metaMethod : null;
+		}
 	}
 }