Skip to content

[release/8.0-staging] #ifdef out code that requires FEATURE_EVENT_TRACE #94715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 2 commits into from
Nov 15, 2023
Merged

[release/8.0-staging] #ifdef out code that requires FEATURE_EVENT_TRACE #94715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
003cd1f
#ifdef out code that requires FEATURE_EVENT_TRACE
yowl Sep 11, 2023
58d7f08
remove assert
yowl Sep 27, 2023
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
1 change: 0 additions & 1 deletion src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10069,7 +10069,6 @@ void gc_heap::update_ro_segment (heap_segment* seg, uint8_t* allocated, uint8_t*
{
enter_spin_lock (&gc_heap::gc_lock);

assert (use_frozen_segments_p);
assert (heap_segment_read_only_p (seg));
assert (allocated <= committed);
assert (committed <= heap_segment_reserved (seg));
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/nativeaot/Runtime/gcrhenv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,10 +749,12 @@ void GCToEEInterface::DiagGCEnd(size_t index, int gen, int reason, bool fConcurr
UNREFERENCED_PARAMETER(gen);
UNREFERENCED_PARAMETER(reason);

#ifdef FEATURE_EVENT_TRACE
if (!fConcurrent)
{
ETW::GCLog::WalkHeap();
}
#endif // FEATURE_EVENT_TRACE
}

// Note on last parameter: when calling this for bgc, only ETW
Expand Down