Skip to content

Add ToDictionarySkipDuplicates - fix duplicate key. #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KirillOsenkov merged 1 commit into from
Feb 19, 2025
Merged

Add ToDictionarySkipDuplicates - fix duplicate key. #395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ILRepack/Steps/ModuleInitializersRepackStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,26 @@ private void DemoteModuleInitializerMethodToNormalMethod(MethodDefinition initia
initializer.IsRuntimeSpecialName = false;
}

private Dictionary<string, AssemblyDefinition> ToDictionarySkipDuplicates(IEnumerable<AssemblyDefinition> assemblies)
{
var dict = new Dictionary<string, AssemblyDefinition>();
foreach (var assembly in assemblies)
{
if (!dict.ContainsKey(assembly.Name.Name))
Copy link
Collaborator

@KirillOsenkov KirillOsenkov Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assembly.Name.Name is repeated three times, it's good to extract a local variable and reuse it

Copy link
Contributor Author

@ricaun ricaun Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense, oh you already changed to the key. Nice!

{
dict[assembly.Name.Name] = assembly;
}
else
{
_logger.Verbose($"- Duplicate key found: {assembly.Name.Name} - skipping");
}
}
return dict;
}

private List<AssemblyDefinition> TopologicalSort(HashSet<AssemblyDefinition> assemblies)
{
var loadedAssemblies = assemblies.ToDictionary(a => a.Name.Name); // Ensure quick lookup
var loadedAssemblies = ToDictionarySkipDuplicates(assemblies); // Ensure quick lookup
var visited = new HashSet<AssemblyDefinition>();
var deepFirstAssemblies = new List<AssemblyDefinition>(assemblies.Count);

Expand Down