Skip to content

Remove corert#2785 BadImageFormatException workaround from ILCompiler #127591

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

Open
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+1 −24
Open

Remove corert#2785 BadImageFormatException workaround from ILCompiler #127591

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50598d2
Initial plan
Copilot Apr 30, 2026
e0a349a
Remove corert#2785 workaround from ILCompiler Program.cs
Copilot Apr 30, 2026
12571ae
Nit
MichalStrehovsky Apr 30, 2026
d78b29e
Apply suggestion from @Copilot
MichalStrehovsky Apr 30, 2026
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
25 changes: 1 addition & 24 deletions src/coreclr/tools/aot/ILCompiler/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,30 +129,7 @@ public int Run()
genericCycleDepthCutoff: Get(_command.MaxGenericCycleDepth),
genericCycleBreadthCutoff: Get(_command.MaxGenericCycleBreadth));

//
// TODO: To support our pre-compiled test tree, allow input files that aren't managed assemblies since
// some tests contain a mixture of both managed and native binaries.
//
// See: https://github.com/dotnet/corert/issues/2785
//
// When we undo this hack, replace the foreach with
// typeSystemContext.InputFilePaths = _command.Result.GetValueForArgument(inputFilePaths);
//
Dictionary<string, string> inputFilePaths = new Dictionary<string, string>();
foreach (var inputFile in _command.Result.GetValue(_command.InputFilePaths))
{
try
{
var module = typeSystemContext.GetModuleFromPath(inputFile.Value);
inputFilePaths.Add(inputFile.Key, inputFile.Value);
}
catch (TypeSystemException.BadImageFormatException)
{
// Keep calm and carry on.
}
}

typeSystemContext.InputFilePaths = inputFilePaths;
typeSystemContext.InputFilePaths = _command.Result.GetValue(_command.InputFilePaths);
typeSystemContext.ReferenceFilePaths = Get(_command.ReferenceFiles);
if (!typeSystemContext.InputFilePaths.ContainsKey(systemModuleName)
&& !typeSystemContext.ReferenceFilePaths.ContainsKey(systemModuleName))
Expand Down
Loading