Skip to content

Making IPC events platform neutral #127943

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
rcj1 merged 5 commits into from
May 8, 2026
Merged

Making IPC events platform neutral #127943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce212d5
making IPC events platform neutral
rcj1 May 7, 2026
f0542c1
fix build breaks and address copilot feedback
rcj1 May 8, 2026
bbdae94
more build fixes
rcj1 May 8, 2026
120c425
more build fixes
rcj1 May 8, 2026
69f4017
fix build breaks and address copilot feedback
rcj1 May 8, 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
2 changes: 1 addition & 1 deletion src/coreclr/debug/daccess/dacdbiimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@ TypeHandle DacDbiInterfaceImpl::TypeDataWalk::ReadLoadedTypeArg(TypeHandleReadTy
switch (elementType)
{
case ELEMENT_TYPE_PTR:
_ASSERTE(pData->numTypeArgs == 1);
_ASSERTE(pData->numTypeArgs == (UINT)1);
return PtrOrByRefTypeArg(pData, retrieveWhich);
break;

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/debug/di/breakpoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ HRESULT CordbFunctionBreakpoint::Activate(BOOL fActivate)

pEvent->BreakpointData.funcMetadataToken = m_code->GetMetadataToken();
pEvent->BreakpointData.vmAssembly = m_code->GetModule()->GetRuntimeAssembly();
pEvent->BreakpointData.encVersion = m_code->GetVersion();
pEvent->BreakpointData.encVersion = (UINT)(m_code->GetVersion());

BOOL codeIsIL = m_code->IsIL();

pEvent->BreakpointData.isIL = m_offsetIsIl ? true : false;
pEvent->BreakpointData.offset = m_offset;
pEvent->BreakpointData.offset = (UINT)m_offset;
if (codeIsIL)
{
pEvent->BreakpointData.nativeCodeMethodDescToken = pEvent->BreakpointData.nativeCodeMethodDescToken.NullPtr();
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/debug/di/divalue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ HRESULT CordbValue::InternalCreateHandle(CorDebugHandleType handleType,
m_appdomain->GetADToken());

CORDB_ADDRESS addr = GetValueHome() != NULL ? GetValueHome()->GetAddress() : (CORDB_ADDRESS)NULL;
event.CreateHandle.objectToken = CORDB_ADDRESS_TO_PTR(addr);
event.CreateHandle.objectToken = addr;
event.CreateHandle.handleType = handleType;

// Note: two-way event here...
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/debug/di/module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ class CleanupRemoteBuffer
true,
pModule->GetAppDomain()->GetADToken());

event.MetadataUpdateRequest.pMetadataStart = CORDB_ADDRESS_TO_PTR(bufferMetaData.pAddress);
event.MetadataUpdateRequest.pMetadataStart = bufferMetaData.pAddress;

// Note: two-way event here...
IfFailThrow(pProcess->SendIPCEvent(&event, sizeof(DebuggerIPCEvent)));
Expand Down Expand Up @@ -548,7 +548,7 @@ void CordbModule::RefreshMetaData()
//
// Update it on the RS
//
bufferMetaData.Init(PTR_TO_CORDB_ADDRESS(event.MetadataUpdateRequest.pMetadataStart), (ULONG) event.MetadataUpdateRequest.nMetadataSize);
bufferMetaData.Init(event.MetadataUpdateRequest.pMetadataStart, (ULONG) event.MetadataUpdateRequest.nMetadataSize);

// init the cleanup object to ensure the buffer gets destroyed later
cleanup.bufferMetaData = bufferMetaData;
Expand Down Expand Up @@ -2217,7 +2217,7 @@ HRESULT CordbModule::ApplyChangesInternal(ULONG cbMetaData,
retEvent->type == DB_IPCE_ENC_ADD_FUNCTION)
{
// Update the function collection to reflect this edit
hr = pModule->UpdateFunction(retEvent->EnCUpdate.memberMetadataToken, retEvent->EnCUpdate.newVersionNumber, NULL);
hr = pModule->UpdateFunction(retEvent->EnCUpdate.memberMetadataToken, (SIZE_T)(ULONG64)retEvent->EnCUpdate.newVersionNumber, NULL);

}
// mark the class and relevant type as old so we update it next time we try to query it
Expand Down
Loading