Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/coreclr/vm/marshalnative.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
6 changes: 0 additions & 6 deletions src/tests/issues.targets
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,6 @@
<ExcludeList Include="$(XunitTestBinBase)/tracing/runtimeeventsource/nativeruntimeeventsource/*">
<Issue>https://github.com/dotnet/runtime/issues/68690</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/*">
<Issue>https://github.com/dotnet/runtime/issues/80666</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/regress/vsw/373472/**">
<Issue>Allocates large contiguous array that is not consistently available on 32-bit platforms</Issue>
</ExcludeList>
Expand All @@ -423,9 +420,6 @@
<ExcludeList Include="$(XunitTestBinBase)/profiler/eventpipe/eventpipe/*">
<Issue>https://github.com/dotnet/runtime/issues/66174</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/tracing/eventpipe/eventsourceerror/eventsourceerror/*">
<Issue>https://github.com/dotnet/runtime/issues/80666</Issue>
</ExcludeList>
</ItemGroup>

<!-- OSX x64 on CoreCLR Runtime -->
Expand Down