diff options
author | Adrian McCarthy <amccarth@google.com> | 2018-04-16 17:01:18 +0000 |
---|---|---|
committer | Adrian McCarthy <amccarth@google.com> | 2018-04-16 17:01:18 +0000 |
commit | a14fac4e51e48c6fb9e2e5fc6e33b97eac991193 (patch) | |
tree | a9bd24452f1ec5d8eff7631df891b756d8a1bff4 | |
parent | 84d38622bdffb95a8de3b6cbf2096bc1b76daffd (diff) |
Remove faulty assertion in llvm-pdbutil
If a class's first data member is an instance of an empty class, then an
assertion in the PrettyClassLayoutGraphicalDumper would fail. The
storage is reserved, but it's not marked as in use.
As far as I understand, it's the assertion that's faulty, so I removed it
and updated the nearby comment.
Found by running llvm-pdbutil against its own PDB, and this assertion would
fail on HashAdjusters, which is a HashTable whose first data member is a
TraitsT, which is a PdbHashTraits<T>, which is an empty struct. (The struct
has a specialization for uint32_t, but that specialization doesn't apply
here because the T is actually ulittle32_t.)
Differential Revision: https://reviews.llvm.org/D45645
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@330135 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp b/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp index 66c29fc5d4e..a572522c8cd 100644 --- a/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp +++ b/tools/llvm-pdbutil/PrettyClassLayoutGraphicalDumper.cpp @@ -50,12 +50,9 @@ bool PrettyClassLayoutGraphicalDumper::start(const UDTLayoutBase &Layout) { uint32_t RelativeOffset = Item->getOffsetInParent(); CurrentAbsoluteOffset = ClassOffsetZero + RelativeOffset; - // Since there is storage there, it should be set! However, this might - // be an empty base, in which case it could extend outside the bounds of - // the parent class. + // This might be an empty base, in which case it could extend outside the + // bounds of the parent class. if (RelativeOffset < UseMap.size() && (Item->getSize() > 0)) { - assert(UseMap.test(RelativeOffset)); - // If there is any remaining padding in this class, and the offset of the // new item is after the padding, then we must have just jumped over some // padding. Print a padding row and then look for where the next block |