diff options
author | Qin Zhao <zhaoqin@google.com> | 2016-07-07 03:20:24 +0000 |
---|---|---|
committer | Qin Zhao <zhaoqin@google.com> | 2016-07-07 03:20:24 +0000 |
commit | 4f47f51e687aaf4ea749e0cc72e4a1dc60e4ae95 (patch) | |
tree | 859a1b5bfc9c6d2e50513931ba13c7716aa53445 /lib/esan | |
parent | 3df39427e495cb2ae84b9d7fc8541d4601f7b597 (diff) |
[esan|cfrag] Handle binaries built with -esan-aux-field-info=false
Summary:
Handles binaries built with -esan-aux-field-info=false and print less
information.
Updates test struct-simple.cpp.
Reviewers: aizatsky
Subscribers: llvm-commits, bruening, eugenis, kcc, zhaoqin, kubabrecka, vitalybuka
Differential Revision: http://reviews.llvm.org/D22020
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@274727 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/esan')
-rw-r--r-- | lib/esan/cache_frag.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/esan/cache_frag.cpp b/lib/esan/cache_frag.cpp index e3384a982..343abfcd5 100644 --- a/lib/esan/cache_frag.cpp +++ b/lib/esan/cache_frag.cpp @@ -28,11 +28,12 @@ struct StructInfo { const char *StructName; u32 Size; u32 NumFields; - u32 *FieldOffsets; - u32 *FieldSize; - const char **FieldTypeNames; + u32 *FieldOffset; // auxiliary struct field info. + u32 *FieldSize; // auxiliary struct field info. + const char **FieldTypeName; // auxiliary struct field info. u64 *FieldCounters; u64 *ArrayCounter; + bool hasAuxFieldInfo() { return FieldOffset != nullptr; } }; // This should be kept consistent with LLVM's EfficiencySanitizer CacheFragInfo. @@ -99,10 +100,17 @@ static void reportStructCounter(StructHashMap::Handle &Handle) { Report(" %s %.*s\n", type, end - start, start); Report(" size = %u, count = %llu, ratio = %llu, array access = %llu\n", Struct->Size, Handle->Count, Handle->Ratio, *Struct->ArrayCounter); - for (u32 i = 0; i < Struct->NumFields; ++i) { - Report(" #%2u: offset = %u,\t size = %u,\t count = %llu,\t type = %.*s\n", - i, Struct->FieldOffsets[i], Struct->FieldSize[i], - Struct->FieldCounters[i], TypePrintLimit, Struct->FieldTypeNames[i]); + if (Struct->hasAuxFieldInfo()) { + for (u32 i = 0; i < Struct->NumFields; ++i) { + Report(" #%2u: offset = %u,\t size = %u," + "\t count = %llu,\t type = %.*s\n", + i, Struct->FieldOffset[i], Struct->FieldSize[i], + Struct->FieldCounters[i], TypePrintLimit, Struct->FieldTypeName[i]); + } + } else { + for (u32 i = 0; i < Struct->NumFields; ++i) { + Report(" #%2u: count = %llu\n", i, Struct->FieldCounters[i]); + } } } |