1 files changed, 9 insertions, 2 deletions
diff --git a/src/inc/gcinfoencoder.h b/src/inc/gcinfoencoder.h
index 838f1babf7..d09f43058f 100644
--- a/src/inc/gcinfoencoder.h
+++ b/src/inc/gcinfoencoder.h
@@ -100,6 +100,11 @@
 
 #include "gcinfotypes.h"
 
+// As stated in issue #6008, GcInfoSize should be incorporated into debug builds. 
+#ifdef _DEBUG
+#define MEASURE_GCINFO
+#endif
+
 #ifdef MEASURE_GCINFO
 struct GcInfoSize
 {
@@ -110,10 +115,13 @@ struct GcInfoSize
     size_t NumRanges;
     size_t NumRegs;
     size_t NumStack;
-    size_t NumEh;
+    size_t NumUntracked;
     size_t NumTransitions;
     size_t SizeOfCode;
+    size_t EncPreservedSlots;
 
+    size_t UntrackedSlotSize;
+    size_t NumUntrackedSize;
     size_t FlagsSize;
     size_t RetKindSize;
     size_t CodeLengthSize;
@@ -134,7 +142,6 @@ struct GcInfoSize
     size_t RegSlotSize;
     size_t StackSlotSize;
     size_t CallSiteStateSize;
-    size_t NumEhSize;
     size_t EhPosSize;
     size_t EhStateSize;
     size_t ChunkPtrSize;