From 835e8149756351047b0775aec6d98b841f55990c Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Sat, 21 Jun 2025 18:33:38 -0400 Subject: [PATCH] Fix illumos compile error in coreclr/vm/appdomain.hpp src/coreclr/vm/appdomain.hpp:1934:40: error: declaration of 'constexpr SystemDomain** const cdac_data::SystemDomain' changes meaning of 'SystemDomain' [-Wchanges-meaning] 1934 | static constexpr PTR_SystemDomain* SystemDomain = &SystemDomain::m_pSystemDomain; | ^~~~~~~~~~~~ src/coreclr/vm/appdomain.hpp:1934:56: note: used here to mean 'class SystemDomain' 1934 | static constexpr PTR_SystemDomain* SystemDomain = &SystemDomain::m_pSystemDomain; | ^~~~~~~~~~~~ src/coreclr/vm/appdomain.hpp:1629:7: note: declared here 1629 | class SystemDomain final | ^~~~~~~~~~~~ --- src/coreclr/debug/runtimeinfo/datadescriptor.h | 2 +- src/coreclr/vm/appdomain.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/debug/runtimeinfo/datadescriptor.h b/src/coreclr/debug/runtimeinfo/datadescriptor.h index 04d6070ac6098d..ee4192dcbb830c 100644 --- a/src/coreclr/debug/runtimeinfo/datadescriptor.h +++ b/src/coreclr/debug/runtimeinfo/datadescriptor.h @@ -927,7 +927,7 @@ CDAC_GLOBAL_STRING(RID, RID_STRING) CDAC_GLOBAL(GCInfoVersion, uint32, GCINFO_VERSION) CDAC_GLOBAL_POINTER(AppDomain, &AppDomain::m_pTheAppDomain) -CDAC_GLOBAL_POINTER(SystemDomain, cdac_data::SystemDomain) +CDAC_GLOBAL_POINTER(SystemDomain, cdac_data::SystemDomainPtr) CDAC_GLOBAL_POINTER(ThreadStore, &ThreadStore::s_pThreadStore) CDAC_GLOBAL_POINTER(FinalizerThread, &::g_pFinalizerThread) CDAC_GLOBAL_POINTER(GCThread, &::g_pSuspensionThread) diff --git a/src/coreclr/vm/appdomain.hpp b/src/coreclr/vm/appdomain.hpp index a3098372ffd9ce..5e74fd4e7c84fc 100644 --- a/src/coreclr/vm/appdomain.hpp +++ b/src/coreclr/vm/appdomain.hpp @@ -1937,7 +1937,7 @@ inline static BOOL IsUnderDomainLock() { LIMITED_METHOD_CONTRACT; return m_Syste template<> struct cdac_data { - static constexpr PTR_SystemDomain* SystemDomain = &SystemDomain::m_pSystemDomain; + static constexpr PTR_SystemDomain* SystemDomainPtr = &SystemDomain::m_pSystemDomain; }; #endif // DACCESS_COMPILE