Skip to content
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

Jump to bottom

R2RDump improvements #46833

Merged
merged 2 commits into from
Jan 12, 2021
Merged

R2RDump improvements #46833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0026a3d
Improve R2RDump error message when an assembly is not R2R
nattress Jan 8, 2021
9895b78
[R2RDump] Fix signature parsing when module override token present
nattress Jan 11, 2021
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
17 changes: 13 additions & 4 deletions 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 @@ -481,12 +481,21 @@ public IReadOnlyDictionary<TMethod, ReadyToRunMethod> GetCustomMethodToRuntimeFu

private bool TryLocateNativeReadyToRunHeader()
{
PEExportTable exportTable = CompositeReader.GetExportTable();
if (exportTable.TryGetValue("RTR_HEADER", out _readyToRunHeaderRVA))
try
{
_composite = true;
return true;
PEExportTable exportTable = CompositeReader.GetExportTable();
if (exportTable.TryGetValue("RTR_HEADER", out _readyToRunHeaderRVA))
{
_composite = true;
return true;
}
}
catch (BadImageFormatException)
{
// MSIL assemblies with no ready-to-run payload typically have no export table
return false;
}

return false;
}

Expand Down
36 changes: 26 additions & 10 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunSignature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,13 +458,15 @@ protected void UpdateOffset(int offset)
/// <param name="offset">Signature offset within the PE file byte array</param>
public R2RSignatureDecoder(IR2RSignatureTypeProvider<TType, TMethod, TGenericContext> provider, TGenericContext context, MetadataReader metadataReader, ReadyToRunReader r2rReader, int offset)
{
_metadataReader = metadataReader;
_outerReader = metadataReader;
Context = context;
_provider = provider;
_image = r2rReader.Image;
_originalOffset = _offset = offset;
_contextReader = r2rReader;
MetadataReader moduleOverrideMetadataReader = TryGetModuleOverrideMetadataReader();
_metadataReader = moduleOverrideMetadataReader ?? metadataReader;
_outerReader = moduleOverrideMetadataReader ?? metadataReader;
Reset();
}

/// <summary>
Expand All @@ -480,11 +482,27 @@ public R2RSignatureDecoder(IR2RSignatureTypeProvider<TType, TMethod, TGenericCon
{
Context = context;
_provider = provider;
_metadataReader = metadataReader;
_image = signature;
_originalOffset = _offset = offset;
_outerReader = outerReader;
_contextReader = contextReader;
MetadataReader moduleOverrideMetadataReader = TryGetModuleOverrideMetadataReader();
_metadataReader = moduleOverrideMetadataReader ?? metadataReader;
_outerReader = moduleOverrideMetadataReader ?? outerReader;
Reset();
}

private MetadataReader TryGetModuleOverrideMetadataReader()
{
bool moduleOverride = (ReadByte() & (byte)ReadyToRunFixupKind.ModuleOverride) != 0;
// Check first byte for a module override being encoded
if (moduleOverride)
{
int moduleIndex = (int)ReadUInt();
IAssemblyMetadata refAsmEcmaReader = _contextReader.OpenReferenceAssembly(moduleIndex);
return refAsmEcmaReader.MetadataReader;
}

return null;
}

/// <summary>
Expand Down Expand Up @@ -1098,17 +1116,15 @@ private ReadyToRunSignature ParseSignature(StringBuilder builder)
bool moduleOverride = (fixupType & (byte)ReadyToRunFixupKind.ModuleOverride) != 0;
SignatureDecoder moduleDecoder = this;

// Check first byte for a module override being encoded
// Check first byte for a module override being encoded. The metadata reader for the module
// override is configured in the R2RSignatureDecoder constructor.
if (moduleOverride)
{
fixupType &= ~(uint)ReadyToRunFixupKind.ModuleOverride;
int moduleIndex = (int)ReadUIntAndEmitInlineSignatureBinary(builder);
IAssemblyMetadata refAsmEcmaReader = _contextReader.OpenReferenceAssembly(moduleIndex);
moduleDecoder = new SignatureDecoder(Context.AssemblyResolver, Context.Options, refAsmEcmaReader.MetadataReader, _image, Offset, refAsmEcmaReader.MetadataReader, _contextReader);
ReadUIntAndEmitInlineSignatureBinary(builder);
}

ReadyToRunSignature result = moduleDecoder.ParseSignature((ReadyToRunFixupKind)fixupType, builder);
UpdateOffset(moduleDecoder.Offset);
ReadyToRunSignature result = ParseSignature((ReadyToRunFixupKind)fixupType, builder);
return result;
}

Expand Down