Skip to content

[mono] ILStrip write directly to the output filestream #112142

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
lewing merged 5 commits into from
Feb 5, 2025
Merged

[mono] ILStrip write directly to the output filestream #112142

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b49249
make sure the memorystream is disposed
lewing Feb 4, 2025
20b7095
more cleanup
lewing Feb 4, 2025
f2a358e
Just write to the filestream directly
lewing Feb 5, 2025
f1fe0c6
Remove explicit flushes
lewing Feb 5, 2025
3c550c1
just write bytes
lewing Feb 5, 2025
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
35 changes: 17 additions & 18 deletions src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,10 @@ private Dictionary<int, int> ComputeMethodBodyUsage(MetadataReader mr, StreamRea
private void CreateTrimmedAssembly(PEReader peReader, string trimmedAssemblyFilePath, FileStream fs, Dictionary<int, int> methodBodyUses)
{
using FileStream os = File.Open(trimmedAssemblyFilePath, FileMode.Create);
using MemoryStream memStream = new MemoryStream((int)fs.Length);

fs.Position = 0;
fs.CopyTo(memStream);
fs.CopyTo(os);
fs.Flush();

foreach (var kvp in methodBodyUses)
{
Expand All @@ -318,19 +318,16 @@ private void CreateTrimmedAssembly(PEReader peReader, string trimmedAssemblyFile
{
int methodSize = ComputeMethodSize(peReader, rva);
int actualLoc = ComputeMethodHash(peReader, rva);
int headerSize = ComputeMethodHeaderSize(memStream, actualLoc);
int headerSize = ComputeMethodHeaderSize(fs, actualLoc);
if (headerSize == 1) //Set code size to zero for TinyFormat
SetCodeSizeToZeroForTiny(memStream, actualLoc);
ZeroOutMethodBody(memStream, methodSize, actualLoc, headerSize);
SetCodeSizeToZeroForTiny(os, actualLoc);
ZeroOutMethodBody(os, methodSize, actualLoc, headerSize);
}
else if (count < 0)
{
Log.LogError($"Method usage count is less than zero for rva: {rva}.");
}
}

memStream.Position = 0;
memStream.CopyTo(os);
}

private static int ComputeMethodSize(PEReader peReader, int rva) => peReader.GetMethodBody(rva).Size;
Expand All @@ -342,27 +339,29 @@ private static int ComputeMethodHash(PEReader peReader, int rva)
return (peReader.PEHeaders.SectionHeaders[sectionIndex].PointerToRawData + relativeOffset);
}

private static int ComputeMethodHeaderSize(MemoryStream memStream, int actualLoc)
private static int ComputeMethodHeaderSize(Stream stream, int actualLoc)
{
memStream.Position = actualLoc;
int firstbyte = memStream.ReadByte();
stream.Position = actualLoc;
int firstbyte = stream.ReadByte();
int headerFlag = firstbyte & 0b11;
return (headerFlag == 2 ? 1 : 4);
}

private static void SetCodeSizeToZeroForTiny(MemoryStream memStream, int actualLoc)
private static void SetCodeSizeToZeroForTiny(Stream stream, int actualLoc)
{
memStream.Position = actualLoc;
memStream.WriteByte(0b10);
stream.Position = actualLoc;
stream.WriteByte(0b10);
stream.Flush();
}

private static void ZeroOutMethodBody(MemoryStream memStream, int methodSize, int actualLoc, int headerSize)
private static void ZeroOutMethodBody(Stream stream, int methodSize, int actualLoc, int headerSize)
{
memStream.Position = actualLoc + headerSize;
stream.Position = actualLoc + headerSize;
byte[] zeroBuffer;
zeroBuffer = ArrayPool<byte>.Shared.Rent(methodSize);
zeroBuffer = ArrayPool<byte>.Shared.Rent(methodSize - headerSize);
Array.Clear(zeroBuffer, 0, zeroBuffer.Length);
memStream.Write(zeroBuffer, 0, methodSize - headerSize);
stream.Write(zeroBuffer, 0, zeroBuffer.Length);
stream.Flush();
ArrayPool<byte>.Shared.Return(zeroBuffer);
}

Expand Down
Loading