Skip to content

Remove target ifdefs from dbi #130935

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

Open
rcj1 wants to merge 28 commits into
base: main
Choose a base branch
from
Open

Remove target ifdefs from dbi #130935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
60df83d
Add GetTargetInfo DacDbi API
rcj1 Jul 8, 2026
dd951b9
remove target dependent stuff
rcj1 Jul 9, 2026
21cf1cf
Merge
rcj1 Jul 17, 2026
59789b0
copilot comments
rcj1 Jul 17, 2026
8de4d55
fix
rcj1 Jul 17, 2026
356609a
Update dacdbi.idl
rcj1 Jul 17, 2026
5ceacc0
Potential fix for pull request finding
rcj1 Jul 17, 2026
81d1b61
fix
rcj1 Jul 17, 2026
fc1e282
fix
rcj1 Jul 17, 2026
c6095c0
Update platformspecific.cpp
rcj1 Jul 17, 2026
01d018c
Cast newValue.StartAddress to SIZE_T for pointer size
rcj1 Jul 17, 2026
d649561
revert a couple things
rcj1 Jul 17, 2026
af492d0
Potential fix for pull request finding
rcj1 Jul 17, 2026
c9be9d1
Update valuehome.cpp
rcj1 Jul 17, 2026
8bb0a0c
Update rsthread.cpp
rcj1 Jul 17, 2026
063685f
Potential fix for pull request finding
rcj1 Jul 17, 2026
8de27a5
Potential fix for pull request finding
rcj1 Jul 17, 2026
d82b109
remove shim process finding impl
rcj1 Jul 17, 2026
2b1ad30
fix
rcj1 Jul 17, 2026
31b04ec
remove dead code
rcj1 Jul 17, 2026
05147ef
fix build
rcj1 Jul 18, 2026
266d1c2
code review
rcj1 Jul 22, 2026
2cbda2d
Potential fix for pull request finding
rcj1 Jul 22, 2026
c3d8f5a
code review
rcj1 Jul 22, 2026
847468e
E
rcj1 Jul 23, 2026
d2595a7
fix build
rcj1 Jul 23, 2026
395d082
merge
rcj1 Jul 24, 2026
22e98b9
CCR
rcj1 Jul 25, 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
42 changes: 42 additions & 0 deletions src/coreclr/debug/daccess/dacdbiimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7327,6 +7327,48 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetGenericArgTokenIndex(VMPTR_Met
return S_OK;
}

HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetTargetInfo(OUT TargetInfo * pTargetInfo)
Comment thread
rcj1 marked this conversation as resolved.
{
DD_ENTER_MAY_THROW;

if (pTargetInfo == NULL)
return E_INVALIDARG;

#if defined(TARGET_X86)
pTargetInfo->arch = kArchX86;
#elif defined(TARGET_AMD64)
pTargetInfo->arch = kArchAMD64;
#elif defined(TARGET_ARM)
pTargetInfo->arch = kArchArm;
#elif defined(TARGET_ARM64)
pTargetInfo->arch = kArchArm64;
#elif defined(TARGET_LOONGARCH64)
pTargetInfo->arch = kArchLoongArch64;
#elif defined(TARGET_RISCV64)
pTargetInfo->arch = kArchRiscV64;
#elif defined(TARGET_WASM)
pTargetInfo->arch = kArchWasm;
#else
pTargetInfo->arch = kArchUnknown;
#endif

#if defined(TARGET_UNIX)
pTargetInfo->os = kOSUnix;
#elif defined(TARGET_WINDOWS)
pTargetInfo->os = kOSWindows;
#else
pTargetInfo->os = kOSUnknown;
#endif

#if defined(TARGET_64BIT)
pTargetInfo->pointerSize = 8;
#else
pTargetInfo->pointerSize = 4;
#endif

return S_OK;
}
Comment thread
max-charlamb marked this conversation as resolved.

DacRefWalker::DacRefWalker(ClrDataAccess *dac, BOOL walkStacks, UINT32 handleMask, BOOL resolvePointers)
: mDac(dac), mWalkStacks(walkStacks), mHandleMask(handleMask), mStackWalker(NULL),
mResolvePointers(resolvePointers), mHandleWalker(NULL)
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/debug/daccess/dacdbiimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ class DacDbiInterfaceImpl :
HRESULT STDMETHODCALLTYPE EnumerateAsyncLocals(VMPTR_MethodDesc vmMethod, CORDB_ADDRESS codeAddr, UINT32 state, FP_ASYNC_LOCAL_CALLBACK fpCallback, CALLBACK_DATA pUserData);
HRESULT STDMETHODCALLTYPE GetGenericArgTokenIndex(VMPTR_MethodDesc vmMethod, OUT UINT32* pIndex);

HRESULT STDMETHODCALLTYPE GetTargetInfo(OUT TargetInfo * pTargetInfo);

private:
void TypeHandleToExpandedTypeInfoImpl(AreValueTypesBoxed boxed,
TypeHandle typeHandle,
Expand Down
11 changes: 2 additions & 9 deletions src/coreclr/debug/di/cordb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@
#include "dbgtransportmanager.h"
#endif // FEATURE_DBGIPC_TRANSPORT_DI

#if defined(TARGET_UNIX) || defined(__ANDROID__)
// Local (in-process) debugging is not supported for UNIX and Android.
#define SUPPORT_LOCAL_DEBUGGING 0
#else
#define SUPPORT_LOCAL_DEBUGGING 1
#endif

//-----------------------------------------------------------------------------
// SxS Versioning story for Mscordbi (ICorDebug + friends)
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -437,7 +430,7 @@ DbiGetThreadContext(HANDLE hThread,
DT_CONTEXT *lpContext)
{
// if we aren't local debugging this isn't going to work
#if !defined(HOST_ARM) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !SUPPORT_LOCAL_DEBUGGING
#if !defined(HOST_ARM) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__)
_ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget");
return FALSE;
Comment on lines 432 to 435
#else
Expand Down Expand Up @@ -476,7 +469,7 @@ BOOL
DbiSetThreadContext(HANDLE hThread,
const DT_CONTEXT *lpContext)
{
#if !defined(HOST_ARM) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || !SUPPORT_LOCAL_DEBUGGING
#if !defined(HOST_ARM) || defined(FEATURE_DBGIPC_TRANSPORT_DI) || defined(__ANDROID__)
_ASSERTE(!"Can't use local GetThreadContext remotely, this needed to go to datatarget");
return FALSE;
Comment thread
rcj1 marked this conversation as resolved.
#else
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/debug/di/module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ HRESULT CordbModule::InitPublicMetaDataFromFile(const WCHAR * pszFullPathName,
}

return hr;
#endif // TARGET_UNIX
#endif // HOST_UNIX
}

//---------------------------------------------------------------------------------------
Expand Down Expand Up @@ -2412,7 +2412,7 @@ HRESULT CordbModule::CreateReaderForInMemorySymbols(REFIID riid, void** ppObj)
ReleaseHolder<ISymUnmanagedBinder> pBinder;
if (symFormat == IDacDbiInterface::kSymbolFormatPDB)
{
#ifndef TARGET_UNIX
#ifndef HOST_UNIX
// PDB format - use diasymreader.dll with COM activation
InlineSString<MAX_PATH> ssBuf;
IfFailThrow(GetClrModuleDirectory(ssBuf));
Expand Down
Loading