Index: compiler-rt/trunk/lib/esan/cache_frag.cpp
===================================================================
--- compiler-rt/trunk/lib/esan/cache_frag.cpp
+++ compiler-rt/trunk/lib/esan/cache_frag.cpp
@@ -26,7 +26,9 @@
 // This should be kept consistent with LLVM's EfficiencySanitizer StructInfo.
 struct StructInfo {
   const char *StructName;
+  u32 Size;
   u32 NumFields;
+  u32 *FieldOffsets;
   u64 *FieldCounters;
   const char **FieldTypeNames;
 };
@@ -89,9 +91,11 @@
   end = strchr(start, '#');
   CHECK(end != nullptr);
   Report("  %s %.*s\n", type, end - start, start);
-  Report("   count = %llu, ratio = %llu\n", Handle->Count, Handle->Ratio);
+  Report("   size = %u, count = %llu, ratio = %llu\n",
+         Struct->Size, Handle->Count, Handle->Ratio);
   for (u32 i = 0; i < Struct->NumFields; ++i) {
-    Report("   #%2u: count = %llu,\t type = %s\n", i, Struct->FieldCounters[i],
+    Report("   #%2u: offset = %u,\t count = %llu,\t type = %s\n", i,
+           Struct->FieldOffsets[i], Struct->FieldCounters[i],
            Struct->FieldTypeNames[i]);
   }
 }
Index: compiler-rt/trunk/test/esan/TestCases/struct-simple.cpp
===================================================================
--- compiler-rt/trunk/test/esan/TestCases/struct-simple.cpp
+++ compiler-rt/trunk/test/esan/TestCases/struct-simple.cpp
@@ -142,48 +142,48 @@
   // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp with 5 class(es)/struct(s)
   // CHECK-NEXT:  Unregister class.C#3#14#13#13:  3 fields
   // CHECK-NEXT:   {{.*}} class C
-  // CHECK-NEXT:   {{.*}}  count = 5, ratio = 3
-  // CHECK-NEXT:   {{.*}}  # 0: count = 2, type = %struct.anon = type { i32, i32 }
-  // CHECK-NEXT:   {{.*}}  # 1: count = 2, type = %union.anon = type { double }
-  // CHECK-NEXT:   {{.*}}  # 2: count = 1, type = [10 x i8]
+  // CHECK-NEXT:   {{.*}}  size = 32, count = 5, ratio = 3
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0,  count = 2, type = %struct.anon = type { i32, i32 }
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 8,  count = 2, type = %union.anon = type { double }
+  // CHECK-NEXT:   {{.*}}  # 2: offset = 16, count = 1, type = [10 x i8]
   // CHECK-NEXT:  Unregister struct.anon#2#11#11: 2 fields
   // CHECK-NEXT:   {{.*}} struct anon
-  // CHECK-NEXT:   {{.*}}  count = 2, ratio = 1
-  // CHECK-NEXT:   {{.*}}  # 0: count = 1, type = i32
-  // CHECK-NEXT:   {{.*}}  # 1: count = 1, type = i32
+  // CHECK-NEXT:   {{.*}}  size = 8, count = 2, ratio = 1
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0, count = 1, type = i32
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 4, count = 1, type = i32
   // CHECK-NEXT:  Unregister union.anon#1#3:      1 fields
   // CHECK-NEXT:  Unregister struct.S#2#11#11:    2 fields
   // CHECK-NEXT:   {{.*}} struct S
-  // CHECK-NEXT:   {{.*}}  count = 2, ratio = 2
-  // CHECK-NEXT:   {{.*}}  # 0: count = 2, type = i32
-  // CHECK-NEXT:   {{.*}}  # 1: count = 0, type = i32
+  // CHECK-NEXT:   {{.*}}  size = 8, count = 2, ratio = 2
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0, count = 2, type = i32
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 4, count = 0, type = i32
   // CHECK-NEXT:  Unregister struct.D#3#11#11#11: 3 fields
   // CHECK-NEXT:   {{.*}} struct D
-  // CHECK-NEXT:   {{.*}}  count = 2, ratio = 2
-  // CHECK-NEXT:   {{.*}}  # 0: count = 1, type = i32
-  // CHECK-NEXT:   {{.*}}  # 1: count = 1, type = i32
-  // CHECK-NEXT:   {{.*}}  # 2: count = 0, type = i32
+  // CHECK-NEXT:   {{.*}}  size = 12, count = 2, ratio = 2
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0, count = 1, type = i32
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 4, count = 1, type = i32
+  // CHECK-NEXT:   {{.*}}  # 2: offset = 8, count = 0, type = i32
   // CHECK-NEXT: in esan::processCompilationUnitExit
   // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp with 0 class(es)/struct(s)
   // CHECK-NEXT: in esan::processCompilationUnitExit
   // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp with 5 class(es)/struct(s)
   // CHECK-NEXT:  Unregister struct.A#2#11#11:    2 fields
   // CHECK-NEXT:   {{.*}} struct A
-  // CHECK-NEXT:   {{.*}}  count = 2049, ratio = 2048
-  // CHECK-NEXT:   {{.*}}  # 0: count = 2048, type = i32
-  // CHECK-NEXT:   {{.*}}  # 1: count = 1, type = i32
+  // CHECK-NEXT:   {{.*}}  size = 8, count = 2049, ratio = 2048
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0, count = 2048, type = i32
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 4, count = 1, type = i32
   // CHECK-NEXT:  Unregister struct.B#2#3#2:      2 fields
   // CHECK-NEXT:   {{.*}} struct B
-  // CHECK-NEXT:   {{.*}}  count = 2097153, ratio = 2097152
-  // CHECK-NEXT:   {{.*}}  # 0: count = 1, type = float
-  // CHECK-NEXT:   {{.*}}  # 1: count = 2097152, type = double
+  // CHECK-NEXT:   {{.*}}  size = 16, count = 2097153, ratio = 2097152
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0, count = 1, type = float
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 8, count = 2097152, type = double
   // CHECK-NEXT:  Unregister union.U#1#3:         1 fields
   // CHECK-NEXT:  Duplicated struct.S#2#11#11:    2 fields
   // CHECK-NEXT:  Unregister struct.D#2#11#11:    2 fields
   // CHECK-NEXT:   {{.*}} struct D
-  // CHECK-NEXT:   {{.*}}  count = 1, ratio = 1
-  // CHECK-NEXT:   {{.*}}  # 0: count = 1, type = i32
-  // CHECK-NEXT:   {{.*}}  # 1: count = 0, type = i32
+  // CHECK-NEXT:   {{.*}}  size = 8, count = 1, ratio = 1
+  // CHECK-NEXT:   {{.*}}  # 0: offset = 0, count = 1, type = i32
+  // CHECK-NEXT:   {{.*}}  # 1: offset = 4, count = 0, type = i32
   // CHECK-NEXT: {{.*}}EfficiencySanitizer: total struct field access count = 2099214
 }
 #endif // MAIN