Skip to content

Fix issue in r2rdump where conflicting generic instantiations can cause the r2rdump process to fail #64772

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
merged 1 commit into from
Feb 4, 2022
Merged

Fix issue in r2rdump where conflicting generic instantiations can cause the r2rdump process to fail #64772

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
7 changes: 6 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,12 @@ private void ParsePgoMethods()

PgoInfoKey key = new PgoInfoKey(mdReader, owningType, methodHandle, methodTypeArgs);
PgoInfo info = new PgoInfo(key, this, pgoFormatVersion, Image, pgoOffset);
_pgoInfos.Add(key, info);

// Since we do non-assembly qualified name based matching for generic instantiations, we can have conflicts.
// This is rare, so the current strategy is to just ignore them. This will allow the tooling to work, although
// the text output for PGO will be slightly wrong.
if (!_pgoInfos.ContainsKey(key))
_pgoInfos.Add(key, info);
curParser = allEntriesEnum.GetNext();
}

Expand Down