R2RDump fixes (dotnet#32460)

godspeedu · Feb 18, 2020 · 2d6b77f · 2d6b77f
1 parent 31c404c
commit 2d6b77f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/Amd64/UnwindInfo.cs b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/Amd64/UnwindInfo.cs
@@ -237,7 +237,7 @@ private void ParseUnwindCode(ref int i)
                         code.NextFrameOffset = (int)offset * 16;
                         if ((UnwindCodeArray[i].FrameOffset & 0xF0000000) != 0)
                         {
-                            Console.WriteLine("Warning: Illegal unwindInfo unscaled offset: too large");
+                            throw new BadImageFormatException("Warning: Illegal unwindInfo unscaled offset: too large");
                         }
                     }
                     break;

diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ReadyToRunHeader.cs b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ReadyToRunHeader.cs
@@ -78,7 +78,7 @@ public void ParseCoreHeader(byte[] image, ref int curOffset)
                 var sectionType = (ReadyToRunSectionType)type;
                 if (!Enum.IsDefined(typeof(ReadyToRunSectionType), type))
                 {
-                    Console.WriteLine("Warning: Invalid ReadyToRun section type");
+                    throw new BadImageFormatException("Warning: Invalid ReadyToRun section type");
                 }
                 int sectionStartRva = NativeReader.ReadInt32(image, ref curOffset);
                 int sectionLength = NativeReader.ReadInt32(image, ref curOffset);

diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ReadyToRunReader.cs b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ReadyToRunReader.cs
@@ -381,8 +381,17 @@ private bool TryLocateNativeReadyToRunHeader()
             return false;
         }
 
-        private MetadataReader GetSystemModuleMetadataReader() =>
-            _systemModuleReader ??= _assemblyResolver.FindAssembly(SystemModuleName, Filename);
+        private MetadataReader GetSystemModuleMetadataReader()
+        {
+            if (_systemModuleReader == null)
+            {
+                if (_assemblyResolver != null)
+                {
+                    _systemModuleReader = _assemblyResolver.FindAssembly(SystemModuleName, Filename);
+                }
+            }
+            return _systemModuleReader;
+        }
 
         public MetadataReader GetGlobalMetadataReader()
         {
@@ -630,7 +639,7 @@ private void ParseInstanceMethodEntrypoints(bool[] isEntryPoint)
                     if (_composite)
                     {
                         // The only types that don't have module overrides on them in composite images are primitive types within the system module
-                        mdReader ??= GetSystemModuleMetadataReader();
+                        mdReader = GetSystemModuleMetadataReader();
                     }
                     owningType = decoder.ReadTypeSignatureNoEmit();
                 }