Browse Source

Merge pull request #2489 from cshung/public/update-ready-to-run

Update ready to run
pull/2491/head
Christoph Wille 4 years ago committed by GitHub
parent
commit
6ddb19ee44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
  2. 2
      ILSpy.ReadyToRun/ReadyToRunDisassembler.cs

2
ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj

@ -39,7 +39,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Iced" Version="1.13.0" /> <PackageReference Include="Iced" Version="1.13.0" />
<PackageReference Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="6.0.0-preview.5.21224.4" /> <PackageReference Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="6.0.0-rc.2.21424.11" />
<!-- ILCompiler.Reflection.ReadyToRun has dependencies on System.Reflection.Metadata and <!-- ILCompiler.Reflection.ReadyToRun has dependencies on System.Reflection.Metadata and
System.Runtime.CompilerServices.Unsafe. Because the AddIn compiles into ILSpy's output System.Runtime.CompilerServices.Unsafe. Because the AddIn compiles into ILSpy's output
directory, we're at risk of overwriting our dependencies with different versions. directory, we're at risk of overwriting our dependencies with different versions.

2
ILSpy.ReadyToRun/ReadyToRunDisassembler.cs

@ -243,7 +243,7 @@ namespace ICSharpCode.ILSpy.ReadyToRun
{ {
// This could happen if the compiler is generating bogus variable info mapping record that covers 0 instructions // This could happen if the compiler is generating bogus variable info mapping record that covers 0 instructions
// See https://github.com/dotnet/runtime/issues/47202 // See https://github.com/dotnet/runtime/issues/47202
Debug.Assert(false); // Debug.Assert(false);
continue; continue;
} }
switch (varLoc.VariableLocation.VarLocType) switch (varLoc.VariableLocation.VarLocType)

Loading…
Cancel
Save