Skip to content

[cDAC] Correct EnumMethodInstancesByAddress HResult #118702

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 1 commit into from
Closed

[cDAC] Correct EnumMethodInstancesByAddress HResult #118702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/native/managed/cdac/mscordaccore_universal/Legacy/IXCLRData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ int GetRuntimeNameByAddress(
int GetModuleByAddress(ClrDataAddress address, /*IXCLRDataModule*/ void** mod);

[PreserveSig]
int StartEnumMethodInstancesByAddress(ulong address, /*IXCLRDataAppDomain*/ void* appDomain, ulong* handle);
int StartEnumMethodInstancesByAddress(ClrDataAddress address, /*IXCLRDataAppDomain*/ void* appDomain, ulong* handle);
[PreserveSig]
int EnumMethodInstanceByAddress(ulong* handle, out IXCLRDataMethodInstance? method);
[PreserveSig]
Expand Down
13 changes: 10 additions & 3 deletions src/native/managed/cdac/mscordaccore_universal/Legacy/SOSDacImpl.IXCLRDataProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ private bool HasMethodInstantiation(MethodDescHandle md)
}
}

int IXCLRDataProcess.StartEnumMethodInstancesByAddress(ulong address, /*IXCLRDataAppDomain*/ void* appDomain, ulong* handle)
int IXCLRDataProcess.StartEnumMethodInstancesByAddress(ClrDataAddress address, /*IXCLRDataAppDomain*/ void* appDomain, ulong* handle)
{
int hr = HResults.S_OK;

Expand All @@ -347,14 +347,16 @@ int IXCLRDataProcess.StartEnumMethodInstancesByAddress(ulong address, /*IXCLRDat

try
{
TargetCodePointer methodAddr = address.ToTargetCodePointer(_target);

// ClrDataAccess::IsPossibleCodeAddress
// Does a trivial check on the readability of the address
bool isTriviallyReadable = _target.TryRead(address, out byte _);
bool isTriviallyReadable = _target.TryRead(methodAddr, out byte _);
if (!isTriviallyReadable)
throw new ArgumentException();

IExecutionManager eman = _target.Contracts.ExecutionManager;
if (eman.GetCodeBlockHandle(address) is CodeBlockHandle cbh &&
if (eman.GetCodeBlockHandle(methodAddr) is CodeBlockHandle cbh &&
eman.GetMethodDesc(cbh) is TargetPointer methodDesc)
{
EnumMethodInstances emi = new(_target, methodDesc, TargetPointer.Null);
Expand All @@ -365,6 +367,11 @@ int IXCLRDataProcess.StartEnumMethodInstancesByAddress(ulong address, /*IXCLRDat
hr = emi.Start();
}
}
catch (InvalidOperationException)
{
// If the target read fails, expect HResult to be CORDBG_E_READVIRTUAL_FAILURE
hr = CorDbgHResults.CORDBG_E_READVIRTUAL_FAILURE;
}
catch (System.Exception ex)
{
hr = ex.HResult;
Expand Down
Loading