Skip to content

Move Thread::m_pInterpThreadContext near top of Thread class for stable asm offset #126684

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

Merged
jkotas merged 3 commits into from
Apr 9, 2026
Merged

Move Thread::m_pInterpThreadContext near top of Thread class for stable asm offset #126684

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
e065225
Move Thread::m_pInterpThreadContext near top of Thread class after m_…
Copilot Apr 9, 2026
4491429
Consolidate FEATURE_INTERPRETER block: move field and methods togethe…
Copilot Apr 9, 2026
71827bb
Merge branch 'main' into copilot/move-m-pinterpthreadcontext
jkotas Apr 9, 2026
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
14 changes: 1 addition & 13 deletions src/coreclr/vm/amd64/asmconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,19 +563,7 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadLocalInfo__m_pThread == offsetof(ThreadLoc
#endif
ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod, pCallStub))

#ifdef TARGET_UNIX
#ifdef _DEBUG
#define OFFSETOF__Thread__m_pInterpThreadContext 0xaf8
#else // _DEBUG
#define OFFSETOF__Thread__m_pInterpThreadContext 0x290
#endif // _DEBUG
#else // TARGET_UNIX
#ifdef _DEBUG
#define OFFSETOF__Thread__m_pInterpThreadContext 0xb50
#else // _DEBUG
#define OFFSETOF__Thread__m_pInterpThreadContext 0x2d8
#endif // _DEBUG
#endif // TARGET_UNIX
#define OFFSETOF__Thread__m_pInterpThreadContext 0x30
ASMCONSTANTS_C_ASSERT(OFFSETOF__Thread__m_pInterpThreadContext == offsetof(Thread, m_pInterpThreadContext))

#define OFFSETOF__InterpThreadContext__pStackPointer 0x10
Expand Down
6 changes: 1 addition & 5 deletions src/coreclr/vm/arm/asmconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,7 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadLocalInfo__m_pThread == offsetof(ThreadLoc
#endif
ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod, pCallStub))

#ifdef TARGET_UNIX
#define OFFSETOF__Thread__m_pInterpThreadContext 0x630
#else // TARGET_UNIX
#define OFFSETOF__Thread__m_pInterpThreadContext 0x0
#endif // TARGET_UNIX
#define OFFSETOF__Thread__m_pInterpThreadContext 0x1c
ASMCONSTANTS_C_ASSERT(OFFSETOF__Thread__m_pInterpThreadContext == offsetof(Thread, m_pInterpThreadContext))

#define OFFSETOF__InterpThreadContext__pStackPointer 0x8
Expand Down
10 changes: 1 addition & 9 deletions src/coreclr/vm/arm64/asmconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,15 +298,7 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadLocalInfo__m_pThread == offsetof(ThreadLoc
#endif
ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod, pCallStub))

#ifdef TARGET_UNIX
#ifdef _DEBUG
#define OFFSETOF__Thread__m_pInterpThreadContext 0xb20
#else // _DEBUG
#define OFFSETOF__Thread__m_pInterpThreadContext 0x2b8
#endif // _DEBUG
#else // TARGET_UNIX
#define OFFSETOF__Thread__m_pInterpThreadContext 0xb48
#endif // TARGET_UNIX
#define OFFSETOF__Thread__m_pInterpThreadContext 0x30
ASMCONSTANTS_C_ASSERT(OFFSETOF__Thread__m_pInterpThreadContext == offsetof(Thread, m_pInterpThreadContext))

#define OFFSETOF__InterpThreadContext__pStackPointer 0x10
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/loongarch64/asmconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ ASMCONSTANTS_C_ASSERT(StubPrecodeData__SecretParam == offsetof(StubPrecod
#define OFFSETOF__InterpMethod__pCallStub 0x20
ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod, pCallStub))

#define OFFSETOF__Thread__m_pInterpThreadContext 0xB20
#define OFFSETOF__Thread__m_pInterpThreadContext 0x30
ASMCONSTANTS_C_ASSERT(OFFSETOF__Thread__m_pInterpThreadContext == offsetof(Thread, m_pInterpThreadContext))

#define OFFSETOF__InterpThreadContext__pStackPointer 0x10
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/riscv64/asmconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadLocalInfo__m_pThread == offsetof(ThreadLoc
#endif
ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod, pCallStub))

#define OFFSETOF__Thread__m_pInterpThreadContext 0xB20
#define OFFSETOF__Thread__m_pInterpThreadContext 0x30
ASMCONSTANTS_C_ASSERT(OFFSETOF__Thread__m_pInterpThreadContext == offsetof(Thread, m_pInterpThreadContext))

#define OFFSETOF__InterpThreadContext__pStackPointer 0x10
Expand Down
14 changes: 7 additions & 7 deletions src/coreclr/vm/threads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,13 @@ class Thread
// we fire the AllocationTick event. It's only for tooling purpose.
TypeHandle m_thAllocContextObj;

#ifdef FEATURE_INTERPRETER
public:
InterpThreadContext *m_pInterpThreadContext;
InterpThreadContext* GetInterpThreadContext();
InterpThreadContext* GetOrCreateInterpThreadContext();
#endif // FEATURE_INTERPRETER

#ifndef TARGET_UNIX
private:
_NT_TIB *m_pTEB;
Expand Down Expand Up @@ -3750,13 +3757,6 @@ class Thread
bool m_hasPendingActivation;

friend struct ::cdac_data<Thread>;

#ifdef FEATURE_INTERPRETER
public:
InterpThreadContext *m_pInterpThreadContext;
InterpThreadContext* GetInterpThreadContext();
InterpThreadContext* GetOrCreateInterpThreadContext();
#endif // FEATURE_INTERPRETER
};

template<>
Expand Down
Loading