Make a copy of the image for PEReader (#1263)

dotnet · Jan 3, 2020 · af90e20 · af90e20
1 parent 662817d
commit af90e20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/.../tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/.../tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
@@ -15,9 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reflection.Metadata">
-      <Version>1.6.0</Version>
-    </PackageReference>
+    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/R2RReader.cs b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/R2RReader.cs
@@ -9,6 +9,7 @@
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
 using System.Reflection.PortableExecutable;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -226,27 +227,23 @@ private unsafe void Initialize()
 
             if (MetadataReader == null)
             {
-                Image = File.ReadAllBytes(Filename);
+                byte[] image = File.ReadAllBytes(Filename);
+                Image = image;
 
-                fixed (byte* p = Image)
+                PEReader = new PEReader(Unsafe.As<byte[], ImmutableArray<byte>>(ref image));
+
+                if (!PEReader.HasMetadata)
                 {
-                    IntPtr ptr = (IntPtr)p;
-                    PEReader = new PEReader(p, Image.Length);
+                    throw new Exception($"ECMA metadata not found in file '{Filename}'");
+                }
 
-                    if (!PEReader.HasMetadata)
-                    {
-                        throw new Exception($"ECMA metadata not found in file '{Filename}'");
-                    }
+                MetadataReader = PEReader.GetMetadataReader();
 
-                    MetadataReader = PEReader.GetMetadataReader();
-                }
             }
             else
             {
                 ImmutableArray<byte> content = PEReader.GetEntireImage().GetContent();
-                // TODO: Avoid copying
-                Image = new byte[content.Length];
-                content.CopyTo(Image);
+                Image = Unsafe.As<ImmutableArray<byte>, byte[]>(ref content);
             }
 
             ParseHeader();