diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs index 5638e885771ee5..1e3481d12e9222 100644 --- a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs +++ b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs @@ -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). @@ -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); } @@ -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]; } diff --git a/src/tests/JIT/Methodical/jitinterface/bug603649.cs b/src/tests/JIT/Methodical/jitinterface/bug603649.cs index 04fb49d2ee02a6..46600a1ca703b7 100644 --- a/src/tests/JIT/Methodical/jitinterface/bug603649.cs +++ b/src/tests/JIT/Methodical/jitinterface/bug603649.cs @@ -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; diff --git a/src/tests/Regressions/coreclr/15647/interfacestatics.ilproj b/src/tests/Regressions/coreclr/15647/interfacestatics.ilproj index d4d95de5764ab1..e2c3ed6fb730e7 100644 --- a/src/tests/Regressions/coreclr/15647/interfacestatics.ilproj +++ b/src/tests/Regressions/coreclr/15647/interfacestatics.ilproj @@ -1,10 +1,7 @@ - + true - - partial - true