Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,16 @@ internal DacStreams_1(Target target)
public string? StringFromEEAddress(TargetPointer address)
{
// We use the data subsystem to handle caching results from processing this data
var dictionary = _target.ProcessedData.GetOrAdd<DacStreams_1_Data>(0).EEObjectToString;

dictionary.TryGetValue(address, out string? result);
return result;
try
{
var dictionary = _target.ProcessedData.GetOrAdd<DacStreams_1_Data>(0).EEObjectToString;
dictionary.TryGetValue(address, out string? result);
return result;
}
catch (VirtualReadException)
{
return null;
}
}

internal sealed class DacStreams_1_Data : IData<DacStreams_1_Data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@

using System;
using System.Diagnostics;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.Marshalling;
using System.Text;
using Microsoft.Diagnostics.DataContractReader.Contracts;

namespace Microsoft.Diagnostics.DataContractReader.Legacy;
Expand Down Expand Up @@ -107,7 +109,82 @@ int IXCLRDataMethodInstance.GetTokenAndScope(uint* token, void** /*IXCLRDataModu
}

int IXCLRDataMethodInstance.GetName(uint flags, uint bufLen, uint* nameLen, char* nameBuf)
=> _legacyImpl is not null ? _legacyImpl.GetName(flags, bufLen, nameLen, nameBuf) : HResults.E_NOTIMPL;
{
int hr = HResults.S_OK;

try
{
IRuntimeTypeSystem rts = _target.Contracts.RuntimeTypeSystem;

if (flags != 0)
throw new ArgumentException();

bool fallbackToUnknown = false;
StringBuilder sb = new();
try
{
TypeNameBuilder.AppendMethodInternal(
_target,
sb,
_methodDesc,
TypeNameFormat.FormatSignature |
TypeNameFormat.FormatNamespace |
TypeNameFormat.FormatFullInst);
}
catch
{
string? fallbackName = _target.Contracts.DacStreams.StringFromEEAddress(_methodDesc.Address);
if (fallbackName != null)
{
sb.Clear();
sb.Append(fallbackName);
}
else
{
sb.Clear();
sb.Append("Unknown");
fallbackToUnknown = true;
}
}

OutputBufferHelpers.CopyStringToBuffer(nameBuf, bufLen, nameLen, sb.ToString());

if (!fallbackToUnknown && nameBuf != null && bufLen < sb.Length + 1)
{
hr = HResults.S_FALSE;
}
}
catch (System.Exception ex)
{
hr = ex.HResult;
}

#if DEBUG
if (_legacyImpl is not null)
{
uint nameLenLocal = 0;
char[] nameBufLocal = new char[bufLen > 0 ? bufLen : 1];
int hrLocal;
fixed (char* pNameBufLocal = nameBufLocal)
{
hrLocal = _legacyImpl.GetName(flags, bufLen, &nameLenLocal, nameBuf is null ? null : pNameBufLocal);
}

Debug.Assert(hrLocal == hr, $"cDAC: {hr:x}, DAC: {hrLocal:x}");
if (nameLen is not null)
Debug.Assert(nameLenLocal == *nameLen, $"cDAC: {*nameLen:x}, DAC: {nameLenLocal:x}");

if (nameBuf is not null)
{
string dacName = new string(nameBufLocal, 0, (int)nameLenLocal);
string cdacName = new string(nameBuf);
Debug.Assert(dacName == cdacName, $"cDAC: {cdacName}, DAC: {dacName}");
}
}
#endif

return hr;
}

int IXCLRDataMethodInstance.GetFlags(uint* flags)
=> _legacyImpl is not null ? _legacyImpl.GetFlags(flags) : HResults.E_NOTIMPL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1421,17 +1421,12 @@ int ISOSDacInterface.GetMethodTableName(ClrDataAddress mt, uint count, char* mtN
}
catch
{
try
string? fallbackName = _target.Contracts.DacStreams.StringFromEEAddress(mt.ToTargetPointer(_target));
if (fallbackName != null)
{
string? fallbackName = _target.Contracts.DacStreams.StringFromEEAddress(mt.ToTargetPointer(_target));
if (fallbackName != null)
{
methodTableName.Clear();
methodTableName.Append(fallbackName);
}
methodTableName.Clear();
methodTableName.Append(fallbackName);
}
catch
{ }
}
OutputBufferHelpers.CopyStringToBuffer(mtName, count, pNeeded, methodTableName.ToString());
}
Expand Down