Read the image earlier (dotnet#33576)

hwoodiwiss · Mar 14, 2020 · 4e0671c · 4e0671c
1 parent caa1f1b
commit 4e0671c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ReadyToRunReader.cs b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ReadyToRunReader.cs
@@ -368,6 +368,11 @@ private unsafe void Initialize(MetadataReader metadata)
 
                 PEReader = new PEReader(Unsafe.As<byte[], ImmutableArray<byte>>(ref image));
             }
+            else
+            {
+                ImmutableArray<byte> content = PEReader.GetEntireImage().GetContent();
+                Image = Unsafe.As<ImmutableArray<byte>, byte[]>(ref content);
+            }
 
             if (metadata == null && PEReader.HasMetadata)
             {
@@ -392,9 +397,6 @@ private unsafe void Initialize(MetadataReader metadata)
             {
                 throw new BadImageFormatException($"ECMA metadata / RTR_HEADER not found in file '{Filename}'");
             }
-
-            ImmutableArray<byte> content = PEReader.GetEntireImage().GetContent();
-            Image = Unsafe.As<ImmutableArray<byte>, byte[]>(ref content);
         }
 
         private void EnsureMethods()