Skip to content

Commit c1fdef4

Browse files
authored
Use shared EightObjects InlineArray (#105540)
1 parent ebbebac commit c1fdef4

File tree

1 file changed

+1
-16
lines changed
  • src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing

1 file changed

+1
-16
lines changed

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ internal unsafe bool WriteEvent(ref EventDescriptor eventDescriptor, IntPtr even
481481
Debug.Assert(EtwAPIMaxRefObjCount == 8, $"{nameof(EtwAPIMaxRefObjCount)} must equal the number of fields in {nameof(EightObjects)}");
482482
EightObjects eightObjectStack = default;
483483
Span<int> refObjPosition = stackalloc int[EtwAPIMaxRefObjCount];
484-
Span<object?> dataRefObj = new Span<object?>(ref eightObjectStack._arg0, EtwAPIMaxRefObjCount);
484+
Span<object?> dataRefObj = eightObjectStack;
485485

486486
EventData* userData = stackalloc EventData[2 * argCount];
487487
for (int i = 0; i < 2 * argCount; i++)
@@ -648,21 +648,6 @@ internal unsafe bool WriteEvent(ref EventDescriptor eventDescriptor, IntPtr even
648648
return true;
649649
}
650650

651-
/// <summary>Workaround for inability to stackalloc object[EtwAPIMaxRefObjCount == 8].</summary>
652-
private struct EightObjects
653-
{
654-
internal object? _arg0;
655-
#pragma warning disable CA1823, CS0169, IDE0051, IDE0044
656-
private object? _arg1;
657-
private object? _arg2;
658-
private object? _arg3;
659-
private object? _arg4;
660-
private object? _arg5;
661-
private object? _arg6;
662-
private object? _arg7;
663-
#pragma warning restore CA1823, CS0169, IDE0051, IDE0044
664-
}
665-
666651
/// <summary>
667652
/// WriteEvent, method to be used by generated code on a derived class
668653
/// </summary>

0 commit comments

Comments
 (0)