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

github-actions[bot] · yowl · web-flow · commit 8f5de4045560 · 2023-11-15T10:48:53.000-08:00
* #ifdef out code that requires FEATURE_EVENT_TRACE

* remove assert

---------

Co-authored-by: yowl &lt;scott.waye@hubse.com&gt;
diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp
@@ -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));
diff --git a/src/coreclr/nativeaot/Runtime/gcrhenv.cpp b/src/coreclr/nativeaot/Runtime/gcrhenv.cpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -10069,7 +10069,6 @@ void gc_heap::update_ro_segment (heap_segment* seg, uint8_t* allocated, uint8_t*`
`10069`	`10069`	`{`
`10070`	`10070`	`enter_spin_lock (&gc_heap::gc_lock);`
`10071`	`10071`
`10072`		`- assert (use_frozen_segments_p);`
`10073`	`10072`	`assert (heap_segment_read_only_p (seg));`
`10074`	`10073`	`assert (allocated <= committed);`
`10075`	`10074`	`assert (committed <= heap_segment_reserved (seg));`
Original file line number	Diff line number	Diff line change
`@@ -749,10 +749,12 @@ void GCToEEInterface::DiagGCEnd(size_t index, int gen, int reason, bool fConcurr`
`749`	`749`	`UNREFERENCED_PARAMETER(gen);`
`750`	`750`	`UNREFERENCED_PARAMETER(reason);`
`751`	`751`
	`752`	`+#ifdef FEATURE_EVENT_TRACE`
`752`	`753`	`if (!fConcurrent)`
`753`	`754`	`{`
`754`	`755`	`ETW::GCLog::WalkHeap();`
`755`	`756`	`}`
	`757`	`+#endif // FEATURE_EVENT_TRACE`
`756`	`758`	`}`
`757`	`759`
`758`	`760`	`// Note on last parameter: when calling this for bgc, only ETW`