Skip to content

Commit 89243d6

Browse files
committed
Testing for #80666
1 parent c5b2dcd commit 89243d6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/coreclr/vm/marshalnative.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,10 +390,14 @@ FCIMPL1(LPVOID, MarshalNative::GCHandleInternalGet, OBJECTHANDLE handle)
390390
{
391391
FCALL_CONTRACT;
392392

393-
OBJECTREF objRef;
393+
OBJECTREF objRef = NULL;
394+
395+
HELPER_METHOD_FRAME_BEGIN_RET_0();
394396

395397
objRef = ObjectFromHandle(handle);
396398

399+
HELPER_METHOD_FRAME_END();
400+
397401
return *((LPVOID*)&objRef);
398402
}
399403
FCIMPLEND

src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ protected override unsafe void HandleEnableNotification(
6262
private static unsafe void Callback(byte* sourceId, int isEnabled, byte level,
6363
long matchAnyKeywords, long matchAllKeywords, Interop.Advapi32.EVENT_FILTER_DESCRIPTOR* filterData, void* callbackContext)
6464
{
65+
System.Threading.Thread.Sleep(10);
66+
6567
EventPipeEventProvider _this = (EventPipeEventProvider)GCHandle.FromIntPtr((IntPtr)callbackContext).Target!;
6668
if (_this._eventProvider.TryGetTarget(out EventProvider? target))
6769
{

src/tests/issues.targets

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,6 @@
407407
<ExcludeList Include="$(XunitTestBinBase)/tracing/runtimeeventsource/nativeruntimeeventsource/*">
408408
<Issue>https://github.com/dotnet/runtime/issues/68690</Issue>
409409
</ExcludeList>
410-
<ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/*">
411-
<Issue>https://github.com/dotnet/runtime/issues/80666</Issue>
412-
</ExcludeList>
413410
<ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/regress/vsw/373472/**">
414411
<Issue>Allocates large contiguous array that is not consistently available on 32-bit platforms</Issue>
415412
</ExcludeList>
@@ -423,9 +420,6 @@
423420
<ExcludeList Include="$(XunitTestBinBase)/profiler/eventpipe/eventpipe/*">
424421
<Issue>https://github.com/dotnet/runtime/issues/66174</Issue>
425422
</ExcludeList>
426-
<ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/*">
427-
<Issue>https://github.com/dotnet/runtime/issues/80666</Issue>
428-
</ExcludeList>
429423
</ItemGroup>
430424

431425
<!-- OSX x64 on CoreCLR Runtime -->

0 commit comments

Comments
 (0)