Skip to content

Commit 835e814

Browse files
committed
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>::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 | ^~~~~~~~~~~~
1 parent 52d934e commit 835e814

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/coreclr/debug/runtimeinfo/datadescriptor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ CDAC_GLOBAL_STRING(RID, RID_STRING)
927927
CDAC_GLOBAL(GCInfoVersion, uint32, GCINFO_VERSION)
928928

929929
CDAC_GLOBAL_POINTER(AppDomain, &AppDomain::m_pTheAppDomain)
930-
CDAC_GLOBAL_POINTER(SystemDomain, cdac_data<SystemDomain>::SystemDomain)
930+
CDAC_GLOBAL_POINTER(SystemDomain, cdac_data<SystemDomain>::SystemDomainPtr)
931931
CDAC_GLOBAL_POINTER(ThreadStore, &ThreadStore::s_pThreadStore)
932932
CDAC_GLOBAL_POINTER(FinalizerThread, &::g_pFinalizerThread)
933933
CDAC_GLOBAL_POINTER(GCThread, &::g_pSuspensionThread)

src/coreclr/vm/appdomain.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@ inline static BOOL IsUnderDomainLock() { LIMITED_METHOD_CONTRACT; return m_Syste
19371937
template<>
19381938
struct cdac_data<SystemDomain>
19391939
{
1940-
static constexpr PTR_SystemDomain* SystemDomain = &SystemDomain::m_pSystemDomain;
1940+
static constexpr PTR_SystemDomain* SystemDomainPtr = &SystemDomain::m_pSystemDomain;
19411941
};
19421942
#endif // DACCESS_COMPILE
19431943

0 commit comments

Comments
 (0)