Skip to content

Commit 41c278f

Browse files
committed
Make the code headers independent
Make the jit and interpreter code headers independent
1 parent f6b975c commit 41c278f

11 files changed

+487
-188
lines changed

src/coreclr/debug/daccess/enummem.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,12 @@ HRESULT ClrDataAccess::EnumMemDumpJitManagerInfo(IN CLRDataEnumMemoryFlags flags
318318

319319
if (flags == CLRDATA_ENUM_MEM_HEAP2)
320320
{
321-
EEJitManager* managerPtr = ExecutionManager::GetEEJitManager();
321+
EECodeGenManager* managerPtr = ExecutionManager::GetEEJitManager();
322322
managerPtr->EnumMemoryRegions(flags);
323+
#ifdef FEATURE_INTERPRETER
324+
managerPtr = ExecutionManager::GetInterpreterJitManager();
325+
managerPtr->EnumMemoryRegions(flags);
326+
#endif // FEATURE_INTERPRETER
323327
}
324328

325329
return status;

src/coreclr/debug/daccess/fntableaccess.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static NTSTATUS OutOfProcessFindHeader(ReadMemoryFunction fpReadMemory,PVOID pUs
137137
return STATUS_SUCCESS;
138138
}
139139

140-
#define CODE_HEADER FakeJitRealCodeHeader
140+
#define CODE_HEADER FakeRealCodeHeader
141141
#define ResolveCodeHeader(pHeader) \
142142
if (pHeader) \
143143
{ \

src/coreclr/debug/daccess/fntableaccess.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ typedef struct _FakeHpRealCodeHdr
5555
LPVOID hdrMDesc; // changed from MethodDesc*
5656
DWORD nUnwindInfos;
5757
T_RUNTIME_FUNCTION unwindInfos[0];
58-
} FakeJitRealCodeHeader;
58+
} FakeRealCodeHeader;
5959

6060
typedef struct _FakeHpCodeHdr
6161
{
@@ -85,8 +85,8 @@ class CheckDuplicatedStructLayouts
8585
CHECK_OFFSET(HeapList, pHdrMap);
8686

8787
#if !defined(TARGET_X86)
88-
CHECK_OFFSET(JitRealCodeHeader, nUnwindInfos);
89-
CHECK_OFFSET(JitRealCodeHeader, unwindInfos);
88+
CHECK_OFFSET(RealCodeHeader, nUnwindInfos);
89+
CHECK_OFFSET(RealCodeHeader, unwindInfos);
9090
#endif // !TARGET_X86
9191

9292
#undef CHECK_OFFSET

0 commit comments

Comments
 (0)