Skip to content

Prerequisite 3 for #105403 (src/coreclr) #117021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Prerequisite 3 for #105403 (src/coreclr) #117021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b111eb3
Fix compile error in coreclr/pal/src/thread/thread.cpp
gwr Jun 21, 2025
33d51c5
Fix compile error in coreclr/vm/appdomain.hpp
gwr Jun 21, 2025
aa40a85
Fix compile error in coreclr/runtime/amd64/AllocFast.S
gwr Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/debug/runtimeinfo/datadescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,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>::SystemDomain)
CDAC_GLOBAL_POINTER(SystemDomain, cdac_data<SystemDomain>::SystemDomainPtr)
CDAC_GLOBAL_POINTER(ThreadStore, &ThreadStore::s_pThreadStore)
CDAC_GLOBAL_POINTER(FinalizerThread, &::g_pFinalizerThread)
CDAC_GLOBAL_POINTER(GCThread, &::g_pSuspensionThread)
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/pal/src/thread/thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,10 +1330,9 @@ CorUnix::GetThreadTimesInternal(
CPalThread *pThread;
CPalThread *pTargetThread;
IPalObject *pobjThread = NULL;
clockid_t cid;
#ifdef __sun
int fd;
#else // __sun
clockid_t cid;
#endif // __sun

pThread = InternalGetCurrentThread();
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/runtime/amd64/AllocFast.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ LEAF_ENTRY RhpNewPtrArrayFast, _TEXT

// Delegate overflow handling to the generic helper conservatively

cmp rsi, (0x40000000 / 8) // sizeof(void*)
cmp rsi, 0x8000000 // (0x40000000 / sizeof(void*))
jae C_FUNC(RhpNewArrayFast)

// In this case we know the element size is sizeof(void *), or 8 for x64
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/appdomain.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,7 @@ inline static BOOL IsUnderDomainLock() { LIMITED_METHOD_CONTRACT; return m_Syste
template<>
struct cdac_data<SystemDomain>
{
static constexpr PTR_SystemDomain* SystemDomain = &SystemDomain::m_pSystemDomain;
static constexpr PTR_SystemDomain* SystemDomainPtr = &SystemDomain::m_pSystemDomain;
};
#endif // DACCESS_COMPILE

Expand Down
Loading