diff --git a/src/coreclr/vm/marshalnative.cpp b/src/coreclr/vm/marshalnative.cpp index 8b20efe4a3f6e5..42924f6bfbffa5 100644 --- a/src/coreclr/vm/marshalnative.cpp +++ b/src/coreclr/vm/marshalnative.cpp @@ -390,10 +390,14 @@ FCIMPL1(LPVOID, MarshalNative::GCHandleInternalGet, OBJECTHANDLE handle) { FCALL_CONTRACT; - OBJECTREF objRef; + OBJECTREF objRef = NULL; + + HELPER_METHOD_FRAME_BEGIN_RET_0(); objRef = ObjectFromHandle(handle); + HELPER_METHOD_FRAME_END(); + return *((LPVOID*)&objRef); } FCIMPLEND diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventProvider.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventProvider.cs index bef1e1f5d30584..314bee12e405e3 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventProvider.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventProvider.cs @@ -62,6 +62,8 @@ protected override unsafe void HandleEnableNotification( private static unsafe void Callback(byte* sourceId, int isEnabled, byte level, long matchAnyKeywords, long matchAllKeywords, Interop.Advapi32.EVENT_FILTER_DESCRIPTOR* filterData, void* callbackContext) { + System.Threading.Thread.Sleep(10); + EventPipeEventProvider _this = (EventPipeEventProvider)GCHandle.FromIntPtr((IntPtr)callbackContext).Target!; if (_this._eventProvider.TryGetTarget(out EventProvider? target)) { diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 253b385f699504..b527f6c87a1db8 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -407,9 +407,6 @@ https://github.com/dotnet/runtime/issues/68690 - - https://github.com/dotnet/runtime/issues/80666 - Allocates large contiguous array that is not consistently available on 32-bit platforms @@ -423,9 +420,6 @@ https://github.com/dotnet/runtime/issues/66174 - - https://github.com/dotnet/runtime/issues/80666 -