Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Share `ObjectiveCMarshal` reference-tracking logic between CoreCLR and NativeAOT by Copilot · Pull Request #128961 · dotnet/runtime · GitHub
Skip to content

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT - #128961

Merged
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api
Jun 9, 2026
Merged

Share ObjectiveCMarshal reference-tracking logic between CoreCLR and NativeAOT#128961
AaronRobinsonMSFT merged 9 commits into
mainfrom
copilot/share-objectivecmarshal-api

Conversation

CopilotAI commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

ObjectiveCMarshal had divergent CoreCLR and NativeAOT implementations for tagged reference-tracking memory. This change moves CoreCLR to the same ConditionalWeakTable<object, ObjcTrackingInformation> model used by NativeAOT and updates diagnostics contracts accordingly.

  • Description
    • CoreCLR managed ObjectiveCMarshal now owns tagged memory
      • Added CoreCLR-side s_objects CWT and ObjcTrackingInformation lifecycle logic in ObjectiveCMarshal.CoreCLR.cs.
      • Unified CreateReferenceTrackingHandle / GetOrCreateReferenceTrackingMemory flow to use managed CWT-backed memory for both runtimes.
      • Initialize now passes the CWT instance to native for unmanaged lookup during GC callbacks.
    • CoreCLR native Objective-C interop path no longer uses syncblk tagged storage
      • Removed Objective-C-specific syncblk tagged-memory allocation/retrieval path from interoplibinterface_objc.cpp.
      • Replaced with unmanaged CWT lookup (ConditionalWeakTableObject::TryGetValue) to resolve tagged memory from managed state.
      • Split QCall responsibilities so native only allocates the ref-counted handle (ObjCMarshal_AllocateReferenceTrackingHandle).
    • Unmanaged CWT accessor usage enabled in runtime path
      • Exposed ConditionalWeakTable native lookup helpers for this suspended-runtime callback scenario and clarified constraints in comments.
    • cDAC ObjectiveCMarshal contract folded into version c1
      • Replaced ObjectiveCMarshal_1 implementation to read tagged memory via ObjectiveCMarshal.s_objects and CWT entries.
// CoreCLR native callback path now resolves tagged memory from managed CWT state.CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;

CopilotAI self-assigned this Jun 3, 2026
CopilotAI review requested due to automatic review settings June 3, 2026 20:13
CopilotAI removed the request for review from CopilotJune 3, 2026 20:13
CopilotAI linked an issue Jun 3, 2026 that may be closed by this pull request
CopilotAI requested review from Copilot and removed request for CopilotJune 3, 2026 20:38
CopilotAI changed the title [WIP] Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTJun 3, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT

Copy link
Copy Markdown
Member

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

CopilotAI requested review from Copilot and removed request for CopilotJune 4, 2026 20:50

CopilotAI commented Jun 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot Please fold the cDAC changes into version 1. There is no backwards compat concerns here. We can change version 1 without issue.

Addressed in 0edf747. I folded the ObjectiveCMarshal cDAC changes into version c1, removed the c2 registration/implementation, and updated the CoreCLR data descriptor contract entry back to c1.

CopilotAI changed the title Share ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOTShare ObjectiveCMarshal reference-tracking storage between CoreCLR and NativeAOT (cDAC contract stays at v1)Jun 4, 2026
CopilotAI review requested due to automatic review settings June 8, 2026 18:13
CopilotAIand others added 3 commits June 8, 2026 11:16
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Comment threadsrc/coreclr/vm/object.h
AaronRobinsonMSFTand others added 2 commits June 8, 2026 18:43
Add tests exercising the ConditionalWeakTable-based GetTaggedMemory path:
- ObjectNotInTable: CWT exists but object not tracked
- NullMemory: object tracked but memory pointer is null
- HasMemory: object tracked with valid tagged memory
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…bjC stubs
- Use m_Array directly instead of GetGCSafeDataPtr() per review feedback
- Update Mono ObjectiveCMarshal stubs to match shared API changes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…al methods
Extract the unsafe MethodTable check into a partial method on each runtime
(CoreCLR, NativeAOT, Mono stub) so the shared ObjectiveCMarshal.cs no
longer requires an unsafe context for the validation.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings June 9, 2026 02:50

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot's findings

  • Files reviewed: 27/27 changed files
  • Comments generated: 4

Comment threadsrc/coreclr/vm/object.h
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit 4b6b5d0 into mainJun 9, 2026
174 checks passed
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the copilot/share-objectivecmarshal-api branch June 9, 2026 14:29
tommcdon added a commit that referenced this pull request Jun 12, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
leculver added a commit that referenced this pull request Jun 16, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-preview6 milestone Jun 17, 2026
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
…d NativeAOT (#128961)
`ObjectiveCMarshal` had divergent CoreCLR and NativeAOT implementations
for tagged reference-tracking memory. This change moves CoreCLR to the
same `ConditionalWeakTable<object, ObjcTrackingInformation>` model used
by NativeAOT and updates diagnostics contracts accordingly.
- **Description**
- **CoreCLR managed ObjectiveCMarshal now owns tagged memory**
- Added CoreCLR-side `s_objects` CWT and `ObjcTrackingInformation`
lifecycle logic in `ObjectiveCMarshal.CoreCLR.cs`.
- Unified `CreateReferenceTrackingHandle` /
`GetOrCreateReferenceTrackingMemory` flow to use managed CWT-backed
memory for both runtimes.
- `Initialize` now passes the CWT instance to native for unmanaged
lookup during GC callbacks.
- **CoreCLR native Objective-C interop path no longer uses syncblk
tagged storage**
- Removed Objective-C-specific syncblk tagged-memory
allocation/retrieval path from `interoplibinterface_objc.cpp`.
- Replaced with unmanaged CWT lookup
(`ConditionalWeakTableObject::TryGetValue`) to resolve tagged memory
from managed state.
- Split QCall responsibilities so native only allocates the ref-counted
handle (`ObjCMarshal_AllocateReferenceTrackingHandle`).
- **Unmanaged CWT accessor usage enabled in runtime path**
- Exposed `ConditionalWeakTable` native lookup helpers for this
suspended-runtime callback scenario and clarified constraints in
comments.
- **cDAC ObjectiveCMarshal contract folded into version `c1`**
- Replaced `ObjectiveCMarshal_1` implementation to read tagged memory
via `ObjectiveCMarshal.s_objects` and CWT entries.
```c++
// CoreCLR native callback path now resolves tagged memory from managed CWT state.
CONDITIONAL_WEAK_TABLE_REF trackingTable = (CONDITIONAL_WEAK_TABLE_REF)ObjectFromHandle(g_ObjectiveCTrackingInfoTable);
OBJECTREF trackingInfoObj = NULL;
if (!trackingTable->TryGetValue(object, &trackingInfoObj))
return false;
OBJC_TRACKING_INFO_REF trackingInfo = (OBJC_TRACKING_INFO_REF)trackingInfoObj;
void* taggedLocal = (void*)trackingInfo->_memory;
```
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AaronRobinsonMSFT <30635565+AaronRobinsonMSFT@users.noreply.github.com>
Co-authored-by: Aaron R Robinson <arobins@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
In DAC mode, m_Array yields a host address, but PTR_KIND requires a
target address. GetDataPtr() computes the correct target address via
dac_cast<PTR_BYTE>(this) + offset.
This was broken by PR #128961 which changed from GetDataPtr() to
m_Array, breaking debugger inspection of exception stack traces,
ConditionalWeakTable lookups, and stack frame helper arrays in DAC mode.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
eiriktsarpalis pushed a commit that referenced this pull request Jul 15, 2026
Fixes failing OSX cDac test. I think this is a regression from #128961.
This pull request updates the handling of pointer types in managed code
to better align with how .NET expresses raw pointers. The main change is
to allow fields typed as `IntPtr`/`UIntPtr` (reported as
`"nint"`/`"nuint"`) to be treated as pointers by the contract reader,
improving compatibility and correctness when reading pointer-sized
fields.
Improvements to pointer type handling:
* Updated `AssertPointerType` in `TargetFieldExtensions.cs` to accept
`"nint"` and `"nuint"` as valid pointer type names, in addition to
`"pointer"`, enabling proper handling of managed fields typed as
`IntPtr`/`UIntPtr`.
Test and contract descriptor alignment:
* Modified the test contract for the `_memory` field in
`ObjectiveCMarshalTests.cs` to explicitly set its type as `"nint"`,
ensuring that the pointer read path is validated against the real
managed contract descriptor.
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jul 18, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Share ObjectiveCMarshal API implementation between CoreCLR and NativeAOT

7 participants

@AaronRobinsonMSFT@filipnavara@noahfalk@jkotas@rcj1