Add new ready to run helper to managed tools

Follow up to dotnet#26807.
MichalStrehovsky · Oct 9, 2019 · a2b2f84 · a2b2f84
1 parent 9e6f164
commit a2b2f84
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/tools/crossgen2/Common/Compiler/ReadyToRun.cs b/src/tools/crossgen2/Common/Compiler/ReadyToRun.cs
@@ -148,6 +148,8 @@ public enum ReadyToRunHelper
         // 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/tools/crossgen2/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs b/src/tools/crossgen2/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
@@ -557,6 +557,10 @@ private ISymbolNode GetHelperFtnUncached(CorInfoHelpFunc ftnNum)
                     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/tools/r2rdump/R2RConstants.cs b/src/tools/r2rdump/R2RConstants.cs
@@ -270,6 +270,8 @@ public enum ReadyToRunHelper
 
         // JIT32 x86-specific exception handling
         READYTORUN_HELPER_EndCatch = 0x110,
+
+        READYTORUN_HELPER_StackProbe = 0x111,
     }
 
     public enum CorElementType : byte

diff --git a/src/tools/r2rdump/R2RSignature.cs b/src/tools/r2rdump/R2RSignature.cs
@@ -1615,6 +1615,10 @@ private void ParseHelper(StringBuilder builder)
                     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;