diff --git a/compiler-rt/include/profile/MemProfData.inc b/compiler-rt/include/profile/MemProfData.inc
--- a/compiler-rt/include/profile/MemProfData.inc
+++ b/compiler-rt/include/profile/MemProfData.inc
@@ -106,7 +106,11 @@
   return IsEqual;
 }
 
-MemInfoBlock() : AllocCount(0) {}
+MemInfoBlock() {
+#define MIBEntryDef(NameTag, Name, Type) Name = Type();
+#include "MIBEntryDef.inc"
+#undef MIBEntryDef
+}
 
 MemInfoBlock(uint32_t size, uint64_t access_count, uint32_t alloc_timestamp,
              uint32_t dealloc_timestamp, uint32_t alloc_cpu, uint32_t dealloc_cpu)
@@ -118,7 +122,7 @@
       MinLifetime(TotalLifetime), MaxLifetime(TotalLifetime),
       AllocCpuId(alloc_cpu), DeallocCpuId(dealloc_cpu),
       NumLifetimeOverlaps(0), NumSameAllocCpu(0),
-      NumSameDeallocCpu(0) {
+      NumSameDeallocCpu(0), DataTypeId(0) {
   NumMigratedCpu = AllocCpuId != DeallocCpuId;
 }
 
diff --git a/llvm/include/llvm/ProfileData/MemProfData.inc b/llvm/include/llvm/ProfileData/MemProfData.inc
--- a/llvm/include/llvm/ProfileData/MemProfData.inc
+++ b/llvm/include/llvm/ProfileData/MemProfData.inc
@@ -106,7 +106,11 @@
   return IsEqual;
 }
 
-MemInfoBlock() : AllocCount(0) {}
+MemInfoBlock() {
+#define MIBEntryDef(NameTag, Name, Type) Name = Type();
+#include "MIBEntryDef.inc"
+#undef MIBEntryDef
+}
 
 MemInfoBlock(uint32_t size, uint64_t access_count, uint32_t alloc_timestamp,
              uint32_t dealloc_timestamp, uint32_t alloc_cpu, uint32_t dealloc_cpu)
@@ -118,7 +122,7 @@
       MinLifetime(TotalLifetime), MaxLifetime(TotalLifetime),
       AllocCpuId(alloc_cpu), DeallocCpuId(dealloc_cpu),
       NumLifetimeOverlaps(0), NumSameAllocCpu(0),
-      NumSameDeallocCpu(0) {
+      NumSameDeallocCpu(0), DataTypeId(0) {
   NumMigratedCpu = AllocCpuId != DeallocCpuId;
 }