From: Michal Strehovský Date: Wed, 9 Oct 2019 14:17:05 +0000 (+0200) Subject: Add new ready to run helper to managed tools (dotnet/coreclr#27102) X-Git-Tag: submit/tizen/20210909.063632~11030^2~426 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfb1badf33bca05685643d5bef1b7208647d3940;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Add new ready to run helper to managed tools (dotnet/coreclr#27102) Follow up to dotnet/coreclr#26807. Commit migrated from https://github.com/dotnet/coreclr/commit/ad54f6e03e77c38482d8538550f1bc13b3267015 --- diff --git a/src/coreclr/src/tools/crossgen2/Common/Compiler/ReadyToRun.cs b/src/coreclr/src/tools/crossgen2/Common/Compiler/ReadyToRun.cs index b5a586b..0341367 100644 --- a/src/coreclr/src/tools/crossgen2/Common/Compiler/ReadyToRun.cs +++ b/src/coreclr/src/tools/crossgen2/Common/Compiler/ReadyToRun.cs @@ -148,6 +148,8 @@ namespace ILCompiler // JIT32 x86-specific exception handling EndCatch = 0x110, + StackProbe = 0x111, + // ********************************************************************************************** // // These are not actually part of the R2R file format. We have them here because it's convenient. diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs index b05add2..402562d 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs @@ -557,6 +557,10 @@ namespace Internal.JitInterface id = ReadyToRunHelper.LogMethodEnter; break; + case CorInfoHelpFunc.CORINFO_HELP_STACK_PROBE: + id = ReadyToRunHelper.StackProbe; + break; + case CorInfoHelpFunc.CORINFO_HELP_INITCLASS: case CorInfoHelpFunc.CORINFO_HELP_INITINSTCLASS: case CorInfoHelpFunc.CORINFO_HELP_THROW_ARGUMENTEXCEPTION: diff --git a/src/coreclr/src/tools/r2rdump/R2RConstants.cs b/src/coreclr/src/tools/r2rdump/R2RConstants.cs index bc8e91b..40b7fdb 100644 --- a/src/coreclr/src/tools/r2rdump/R2RConstants.cs +++ b/src/coreclr/src/tools/r2rdump/R2RConstants.cs @@ -270,6 +270,8 @@ namespace R2RDump // JIT32 x86-specific exception handling READYTORUN_HELPER_EndCatch = 0x110, + + READYTORUN_HELPER_StackProbe = 0x111, } public enum CorElementType : byte diff --git a/src/coreclr/src/tools/r2rdump/R2RSignature.cs b/src/coreclr/src/tools/r2rdump/R2RSignature.cs index dc244a7..ca0804d 100644 --- a/src/coreclr/src/tools/r2rdump/R2RSignature.cs +++ b/src/coreclr/src/tools/r2rdump/R2RSignature.cs @@ -1615,6 +1615,10 @@ namespace R2RDump builder.Append("END_CATCH"); break; + case ReadyToRunHelper.READYTORUN_HELPER_StackProbe: + builder.Append("STACK_PROBE"); + break; + default: builder.Append(string.Format("Unknown helper: {0:X2}", helperType)); break;