Skip to content

Remove NativeAOT debug handle tagging #129034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MichalStrehovsky wants to merge 5 commits into
base: main
Choose a base branch
from
+1 −15
Open

Remove NativeAOT debug handle tagging #129034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
226dff4
Preserve JIT handle bits in cross-target builds
MichalStrehovsky Jun 5, 2026
3d5b982
Tests
MichalStrehovsky Jun 5, 2026
77a7e4f
Merge branch 'main' into fix/jit-cross-target-handle-bits
MichalStrehovsky Jun 8, 2026
11abc8f
Address handle tag feedback
Copilot Jun 10, 2026
f9fcb59
Merge branch 'main' into fix/jit-cross-target-handle-bits
MichalStrehovsky Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,10 +738,6 @@ private void CompileMethodCleanup()
private const int handleMultiplier = 8;
private const int handleBase = 0x420000;

#if DEBUG
private static readonly IntPtr s_handleHighBitSet = (sizeof(IntPtr) == 4) ? new IntPtr(0x40000000) : new IntPtr(0x4000000000000000);
#endif

private IntPtr ObjectToHandle(object obj)
{
// MethodILScopes need to go through ObjectToHandle(MethodILScope methodIL).
Expand All @@ -757,9 +753,6 @@ private IntPtr ObjectToHandleUnchecked(object obj)
if (!_objectToHandle.TryGetValue(obj, out handle))
{
handle = (IntPtr)(handleMultiplier * _handleToObject.Count + handleBase);
#if DEBUG
handle = new IntPtr((long)s_handleHighBitSet | (long)handle);
#endif
_handleToObject.Add(obj);
_objectToHandle.Add(obj, handle);
}
Expand All @@ -769,9 +762,6 @@ private IntPtr ObjectToHandleUnchecked(object obj)
private object HandleToObject(void* handle)
{
Debug.Assert(handle != null);
#if DEBUG
handle = (void*)(~s_handleHighBitSet & (nint)handle);
#endif
int index = ((int)handle - handleBase) / handleMultiplier;
return _handleToObject[index];
}
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Methodical/jitinterface/bug603649.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public class foo
private static object s_o = typeof(string);
[Fact]
[OuterLoop]
[ActiveIssue("https://github.com/dotnet/runtime/issues/122013", typeof(TestLibrary.Utilities), nameof(TestLibrary.Utilities.IsNativeAot), nameof(TestLibrary.Utilities.Is32))]
public static int TestEntryPoint()
{
bool f = typeof(string) == s_o as Type;
Expand Down
5 changes: 1 addition & 4 deletions src/tests/Regressions/coreclr/15647/interfacestatics.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<!-- Needed for TrimMode -->
<!-- Needed for CLRTestTargetUnsupported -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<!-- Partial trimming works around https://github.com/dotnet/runtime/issues/122013 -->
<TrimMode>partial</TrimMode>

<!-- https://github.com/dotnet/runtime/issues/34390 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono'">true</CLRTestTargetUnsupported>
</PropertyGroup>
Expand Down
Loading