From f4af00a8f9a65c99a9c9e644b584e2997e4ac75f Mon Sep 17 00:00:00 2001
From: Andrew Au <cshung@gmail.com>
Date: Fri, 22 Sep 2023 21:22:22 -0700
Subject: [PATCH] Update ready to run

---
 ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj   |  2 +-
 ILSpy.ReadyToRun/ReadyToRunDisassembler.cs | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj b/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
index 853436cc7..f0a708b21 100644
--- a/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
+++ b/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
@@ -38,7 +38,7 @@
 
   <ItemGroup>
     <PackageReference Include="Iced" Version="1.18.0" />
-    <PackageReference Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="8.0.0-preview.5.23260.1" />
+    <PackageReference Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="8.0.0-rc.2.23471.30" />
     <!-- ILCompiler.Reflection.ReadyToRun has dependencies on System.Reflection.Metadata and
          System.Runtime.CompilerServices.Unsafe. Because the AddIn compiles into ILSpy's output
          directory, we're at risk of overwriting our dependencies with different versions.
diff --git a/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs b/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs
index a5780db4e..0b7d0ee6c 100644
--- a/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs
+++ b/ILSpy.ReadyToRun/ReadyToRunDisassembler.cs
@@ -114,10 +114,13 @@ namespace ICSharpCode.ILSpy.ReadyToRun
 			ulong baseInstrIP = instructions[0].IP;
 
 			var boundsMap = new Dictionary<uint, uint>();
-			foreach (var bound in runtimeFunction.DebugInfo.BoundsList)
+			if (runtimeFunction.DebugInfo != null)
 			{
-				// ignoring the return value assuming the same key is always mapped to the same value in runtimeFunction.DebugInfo.BoundsList
-				boundsMap.TryAdd(bound.NativeOffset, bound.ILOffset);
+				foreach (var bound in runtimeFunction.DebugInfo.BoundsList)
+				{
+					// ignoring the return value assuming the same key is always mapped to the same value in runtimeFunction.DebugInfo.BoundsList
+					boundsMap.TryAdd(bound.NativeOffset, bound.ILOffset);
+				}
 			}
 
 			foreach (var instr in instructions)
@@ -141,7 +144,10 @@ namespace ICSharpCode.ILSpy.ReadyToRun
 						}
 					}
 				}
-				DecorateGCInfo(instr, baseInstrIP, readyToRunMethod.GcInfo);
+				if (ReadyToRunOptions.GetIsShowGCInfo(null))
+				{
+					DecorateGCInfo(instr, baseInstrIP, readyToRunMethod.GcInfo);
+				}
 				formatter.Format(instr, tempOutput);
 				output.Write(instr.IP.ToString("X16"));
 				output.Write(" ");