Skip to content

cDAC: dereference OBJECTHANDLE in collectible thread-statics #129291

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
leculver wants to merge 4 commits into
base: main
Choose a base branch
from
+7 −2
Open

cDAC: dereference OBJECTHANDLE in collectible thread-statics #129291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd9cfb1
cDAC: dereference OBJECTHANDLE in collectible thread-static base reso…
leculver Jun 11, 2026
9af36ba
Address PR feedback: clarify handle-slot naming and comment
leculver Jun 11, 2026
67fea10
Documentation update
leculver Jun 12, 2026
c072f3f
PR Feedback: Doc update
leculver Jun 12, 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
6 changes: 5 additions & 1 deletion docs/design/datacontracts/Thread.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,11 @@ TargetPointer IThread.GetThreadLocalStaticBase(TargetPointer threadPointer, Targ
if (collectibleCount > indexOffset)
{
TargetPointer collectibleArray = target.ReadPointer(threadLocalDataPtr + /* ThreadLocalData::CollectibleTlsArrayData offset */);
threadLocalStaticBase = target.ReadPointer(collectibleArray + (ulong)(indexOffset * target.PointerSize));
// The collectible TLS array slot holds an OBJECTHANDLE; dereference the handle to the object
TargetPointer handleSlotAddress = collectibleArray + (ulong)(indexOffset * target.PointerSize);
TargetPointer handle = target.ReadPointer(handleSlotAddress);
if (handle != TargetPointer.Null && target.TryReadPointer(handle, out TargetPointer obj))
threadLocalStaticBase = obj;
}
break;
case TLSIndexType.DirectOnThreadLocalData:
Expand Down
3 changes: 2 additions & 1 deletion ...ive/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/Thread_1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ TargetPointer IThread.GetThreadLocalStaticBase(TargetPointer threadPointer, Targ
if (collectibleCount > indexOffset)
{
TargetPointer collectibleArray = threadLocalData.CollectibleTlsArrayData;
threadLocalStaticBase = _target.ReadPointer(collectibleArray + (ulong)(indexOffset * _target.PointerSize));
TargetPointer handleSlotAddress = collectibleArray + (ulong)(indexOffset * _target.PointerSize);
threadLocalStaticBase = _target.ProcessedData.GetOrAdd<Data.ObjectHandle>(handleSlotAddress).Object;
Comment on lines +219 to +220
}
break;
case TLSIndexType.DirectOnThreadLocalData:
Expand Down
Loading