Allow instrumentation for methods with explicit tail calls (#58632)

dotnet · Sep 6, 2021 · 32df679 · 32df679
1 parent dff1c70
commit 32df679
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/coreclr/jit/fgbasic.cpp b/src/coreclr/jit/fgbasic.cpp
@@ -2722,9 +2722,12 @@ unsigned Compiler::fgMakeBasicBlocks(const BYTE* codeAddr, IL_OFFSET codeSize, F
                     if (fgCanSwitchToOptimized() && fgMayExplicitTailCall())
                     {
                         // Method has an explicit tail call that may run like a loop or may not be generated as a tail
-                        // call in tier 0, switch to optimized to avoid spending too much time running slower code and
-                        // to avoid stack overflow from recursion
-                        fgSwitchToOptimized();
+                        // call in tier 0, switch to optimized to avoid spending too much time running slower code
+                        if (!opts.jitFlags->IsSet(JitFlags::JIT_FLAG_BBINSTR) ||
+                            ((info.compFlags & CORINFO_FLG_DISABLE_TIER0_FOR_LOOPS) != 0))
+                        {
+                            fgSwitchToOptimized();
+                        }
                     }
                 }
                 else