Skip to content

Include file path in BadImageFormatException thrown from AddModule #126181

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
MichalStrehovsky merged 11 commits into from
Apr 2, 2026
Merged

Include file path in BadImageFormatException thrown from AddModule #126181

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ea8241
Initial plan
Copilot Mar 27, 2026
7da05c2
Include file path in BadImageFormatException thrown from AddModule
Copilot Mar 27, 2026
83cc428
Respect throwOnFailureToLoad when catching BadImageFormatException
Copilot Mar 27, 2026
269540d
Move HasMetadata check inside try/catch so BadImageFormatException is…
Copilot Mar 30, 2026
d450461
Delete CreateBadImageFormatException(id,fileName) overload; add Throw…
Copilot Mar 30, 2026
ebd4f7f
Fix whitespace
MichalStrehovsky Mar 31, 2026
bdec90d
Use Path.GetFileName to avoid embedding full path in BadImageFormatEx…
Copilot Mar 31, 2026
0da51e5
Simplify: catch BadImageFormatException from HasMetadata and rethrow …
Copilot Apr 1, 2026
82e5902
Apply suggestion from @jkotas
jkotas Apr 1, 2026
6c49cd7
Apply suggestion from @jkotas
jkotas Apr 1, 2026
f068733
Apply suggestion from @jkotas
jkotas Apr 1, 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
18 changes: 14 additions & 4 deletions src/coreclr/tools/Common/Compiler/CompilerTypeSystemContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,23 @@ private EcmaModule AddModule(string filePath, string expectedSimpleName, bool us
filePath = Path.GetFullPath(filePath);
peReader = OpenPEFile(filePath, out mappedViewAccessor);

try
{
Comment thread
jkotas marked this conversation as resolved.
// Ensure the PEHeaders can be read
_ = peReader.PEHeaders;
Comment thread
jkotas marked this conversation as resolved.

#if !READYTORUN
if (peReader.HasMetadata && (peReader.PEHeaders.CorHeader.Flags & (CorFlags.ILLibrary | CorFlags.ILOnly)) == 0)
throw new NotSupportedException($"Error: C++/CLI is not supported: '{filePath}'");
if (peReader.HasMetadata && (peReader.PEHeaders.CorHeader.Flags & (CorFlags.ILLibrary | CorFlags.ILOnly)) == 0)
throw new NotSupportedException($"Error: C++/CLI is not supported: '{filePath}'");
#endif

pdbReader = PortablePdbSymbolReader.TryOpenEmbedded(peReader, GetMetadataStringDecoder())
?? OpenAssociatedSymbolFile(filePath, peReader);
pdbReader = PortablePdbSymbolReader.TryOpenEmbedded(peReader, GetMetadataStringDecoder())
?? OpenAssociatedSymbolFile(filePath, peReader);
}
catch (BadImageFormatException ex)
{
throw new BadImageFormatException(ex.Message, filePath);
}
Comment thread
MichalStrehovsky marked this conversation as resolved.
}
else
{
Expand Down
Loading