From d6cc6fc7c836711dc5302e94732feb1127dc1e76 Mon Sep 17 00:00:00 2001 From: Maoni Stephens Date: Fri, 1 Jul 2016 14:47:30 -0700 Subject: [PATCH] Fixed build breaks related to perf counter code on desktop. perf counters are only enabled on desktop. [tfs-changeset: 1615834] Commit migrated from https://github.com/dotnet/coreclr/commit/30720bc0aa5aa242da615fdcd7f64ffff8581884 --- src/coreclr/src/gc/gcee.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 src/coreclr/src/gc/gcee.cpp diff --git a/src/coreclr/src/gc/gcee.cpp b/src/coreclr/src/gc/gcee.cpp old mode 100755 new mode 100644 index bb0a653..1cc3406 --- a/src/coreclr/src/gc/gcee.cpp +++ b/src/coreclr/src/gc/gcee.cpp @@ -119,8 +119,10 @@ void GCHeap::UpdatePostGCCounters() #if defined(ENABLE_PERF_COUNTERS) || defined(FEATURE_EVENT_TRACE) #ifdef MULTIPLE_HEAPS //take the first heap.... - gc_mechanisms *pSettings = &gc_heap::g_heaps[0]->settings; + gc_heap* hp1 = gc_heap::g_heaps[0]; + gc_mechanisms *pSettings = &hp1->settings; #else + gc_heap* hp1 = pGenGCHeap; gc_mechanisms *pSettings = &gc_heap::settings; #endif //MULTIPLE_HEAPS @@ -242,8 +244,8 @@ void GCHeap::UpdatePostGCCounters() #if defined(ENABLE_PERF_COUNTERS) for (int gen_index = 0; gen_index <= (max_generation+1); gen_index++) { - _ASSERTE(FitsIn(g_GenerationSizes[gen_index]); - _ASSERTE(FitsIn(g_GenerationPromotedSizes[gen_index]); + _ASSERTE(FitsIn(g_GenerationSizes[gen_index])); + _ASSERTE(FitsIn(g_GenerationPromotedSizes[gen_index])); if (gen_index == (max_generation+1)) { -- 2.7.4