In JsRT modes improved a performance of .NET methods projection

Taritsyn · Feb 27, 2023 · 96ab036 · 96ab036
1 parent 4856631
commit 96ab036
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/src/MsieJavaScriptEngine/JsRt/Edge/EdgeTypeMapper.cs b/src/MsieJavaScriptEngine/JsRt/Edge/EdgeTypeMapper.cs
@@ -573,12 +573,12 @@ private void ProjectMethods(EdgeEmbeddedItem externalItem)
 			string typeName = type.FullName;
 			BindingFlags defaultBindingFlags = ReflectionHelpers.GetDefaultBindingFlags(instance);
 			MethodInfo[] methods = type.GetMethods(defaultBindingFlags);
-			IEnumerable<IGrouping<string, MethodInfo>> availableMethodGroups = GetAvailableMethodGroups(methods);
+			Dictionary<string, List<MethodInfo>> availableMethodGroups = GetAvailableMethodGroups(methods);
 
-			foreach (IGrouping<string, MethodInfo> methodGroup in availableMethodGroups)
+			foreach (KeyValuePair<string, List<MethodInfo>> methodGroup in availableMethodGroups)
 			{
 				string methodName = methodGroup.Key;
-				MethodInfo[] methodCandidates = methodGroup.ToArray();
+				MethodInfo[] methodCandidates = methodGroup.Value.ToArray();
 
 				EdgeJsNativeFunction nativeFunction = (callee, isConstructCall, args, argCount, callbackData) =>
 				{

diff --git a/src/MsieJavaScriptEngine/JsRt/Ie/IeTypeMapper.cs b/src/MsieJavaScriptEngine/JsRt/Ie/IeTypeMapper.cs
@@ -573,12 +573,12 @@ private void ProjectMethods(IeEmbeddedItem externalItem)
 			string typeName = type.FullName;
 			BindingFlags defaultBindingFlags = ReflectionHelpers.GetDefaultBindingFlags(instance);
 			MethodInfo[] methods = type.GetMethods(defaultBindingFlags);
-			IEnumerable<IGrouping<string, MethodInfo>> availableMethodGroups = GetAvailableMethodGroups(methods);
+			Dictionary<string, List<MethodInfo>> availableMethodGroups = GetAvailableMethodGroups(methods);
 
-			foreach (IGrouping<string, MethodInfo> methodGroup in availableMethodGroups)
+			foreach (KeyValuePair<string, List<MethodInfo>> methodGroup in availableMethodGroups)
 			{
 				string methodName = methodGroup.Key;
-				MethodInfo[] methodCandidates = methodGroup.ToArray();
+				MethodInfo[] methodCandidates = methodGroup.Value.ToArray();
 
 				IeJsNativeFunction nativeFunction = (callee, isConstructCall, args, argCount, callbackData) =>
 				{

diff --git a/src/MsieJavaScriptEngine/JsRt/TypeMapper.cs b/src/MsieJavaScriptEngine/JsRt/TypeMapper.cs
@@ -229,14 +229,37 @@ protected bool IsAvailableProperty(PropertyInfo property)
 			return isAvailable;
 		}
 
-		protected IEnumerable<IGrouping<string, MethodInfo>> GetAvailableMethodGroups(MethodInfo[] methods)
+		protected Dictionary<string, List<MethodInfo>> GetAvailableMethodGroups(MethodInfo[] methods)
 		{
-			IEnumerable<MethodInfo> availableMethods = methods.Where(ReflectionHelpers.IsFullyFledgedMethod);
-			if (!_allowReflection)
+			int methodCount = methods.Length;
+			if (methodCount == 0)
 			{
-				availableMethods = availableMethods.Where(ReflectionHelpers.IsAllowedMethod);
+				return new Dictionary<string, List<MethodInfo>>();
+			}
+
+			var availableMethodGroups = new Dictionary<string, List<MethodInfo>>(methodCount);
+
+			foreach (MethodInfo method in methods)
+			{
+				if (!ReflectionHelpers.IsFullyFledgedMethod(method)
+					|| (!_allowReflection && !ReflectionHelpers.IsAllowedMethod(method)))
+				{
+					continue;
+				}
+
+				string methodName = method.Name;
+				List<MethodInfo> methodGroup;
+
+				if (availableMethodGroups.TryGetValue(methodName, out methodGroup))
+				{
+					methodGroup.Add(method);
+				}
+				else
+				{
+					methodGroup = new List<MethodInfo> { method };
+					availableMethodGroups.Add(methodName, methodGroup);
+				}
 			}
-			IEnumerable<IGrouping<string, MethodInfo>> availableMethodGroups = availableMethods.GroupBy(m => m.Name);
 
 			return availableMethodGroups;
 		}

diff --git a/src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj b/src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj
@@ -25,7 +25,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageTags>JavaScript;ECMAScript;MSIE;IE;Edge;Chakra</PackageTags>
-    <PackageReleaseNotes>In JavaScript engine settings was added one new property - `AllowReflection` (default `false`).</PackageReleaseNotes>
+    <PackageReleaseNotes>In JsRT modes improved a performance of .NET methods projection.</PackageReleaseNotes>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageOutputPath>../../nuget</PackageOutputPath>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>

diff --git a/src/MsieJavaScriptEngine/readme.txt b/src/MsieJavaScriptEngine/readme.txt
@@ -21,8 +21,7 @@
    =============
    RELEASE NOTES
    =============
-   In JavaScript engine settings was added one new property - `AllowReflection`
-   (default `false`).
+   In JsRT modes improved a performance of .NET methods projection.
 
    ============
    PROJECT SITE