From ad872c78690ce7612d1c1042a96a3015b7f07ada Mon Sep 17 00:00:00 2001 From: Max Charlamb Date: Fri, 18 Sep 2026 10:10:55 -0400 Subject: [PATCH] Expose interpreter JIT manager in cDAC descriptor Publish the optional InterpreterJitManagerAddress global so .NET 11 runtimes contain the descriptor needed by the managed cDAC reader support in #134072. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b507532c-3857-4e61-86a9-69fe22ec157b --- src/coreclr/vm/codeman.h | 3 +++ src/coreclr/vm/datadescriptor/datadescriptor.inc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/coreclr/vm/codeman.h b/src/coreclr/vm/codeman.h index 6e67a78c584d8b..bf48ea087285d8 100644 --- a/src/coreclr/vm/codeman.h +++ b/src/coreclr/vm/codeman.h @@ -2802,6 +2802,9 @@ struct cdac_data { static constexpr void* const CodeRangeMapAddress = (void*)&ExecutionManager::g_codeRangeMap.Data[0]; static constexpr PTR_EEJitManager* EEJitManagerAddress = &ExecutionManager::m_pEEJitManager; +#ifdef FEATURE_INTERPRETER + static constexpr PTR_InterpreterJitManager* InterpreterJitManagerAddress = &ExecutionManager::m_pInterpreterJitManager; +#endif // FEATURE_INTERPRETER #ifdef TARGET_WASM static constexpr FunctionTableIndexRangeSection** FunctionTableIndexRangeListAddress = &ExecutionManager::s_pFunctionTableIndexRangeList; #endif // TARGET_WASM diff --git a/src/coreclr/vm/datadescriptor/datadescriptor.inc b/src/coreclr/vm/datadescriptor/datadescriptor.inc index 25c22dc3a928fc..c843f75fe738a6 100644 --- a/src/coreclr/vm/datadescriptor/datadescriptor.inc +++ b/src/coreclr/vm/datadescriptor/datadescriptor.inc @@ -1827,6 +1827,9 @@ CDAC_GLOBAL(StressLogEnabled, T_UINT8, 0) #endif CDAC_GLOBAL_POINTER(ExecutionManagerCodeRangeMapAddress, cdac_data::CodeRangeMapAddress) CDAC_GLOBAL_POINTER(EEJitManagerAddress, cdac_data::EEJitManagerAddress) +#ifdef FEATURE_INTERPRETER +CDAC_GLOBAL_POINTER(InterpreterJitManagerAddress, cdac_data::InterpreterJitManagerAddress) +#endif // FEATURE_INTERPRETER #ifdef TARGET_WASM CDAC_GLOBAL_POINTER(FunctionTableIndexRangeList, cdac_data::FunctionTableIndexRangeListAddress) #endif // TARGET_WASM