1 files changed, 76 insertions, 67 deletions

diff --git a/include/llvm/DebugInfo/PDB/UDTLayout.h b/include/llvm/DebugInfo/PDB/UDTLayout.h
index e3dcba50bd1a..6bc3660fbe51 100644
--- a/include/llvm/DebugInfo/PDB/UDTLayout.h
+++ b/include/llvm/DebugInfo/PDB/UDTLayout.h
@@ -15,6 +15,7 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/BitVector.h"
+#include "llvm/ADT/DenseMap.h"
 
 #include <list>
 #include <memory>
@@ -32,40 +33,63 @@ class PDBSymbolTypeVTable;
 
 class ClassLayout;
 class BaseClassLayout;
-class StorageItemBase;
+class LayoutItemBase;
 class UDTLayoutBase;
 
-class StorageItemBase {
+class LayoutItemBase {
 public:
-  StorageItemBase(const UDTLayoutBase &Parent, const PDBSymbol &Symbol,
-                  const std::string &Name, uint32_t OffsetInParent,
-                  uint32_t Size);
-  virtual ~StorageItemBase() {}
+  LayoutItemBase(const UDTLayoutBase *Parent, const PDBSymbol *Symbol,
+                 const std::string &Name, uint32_t OffsetInParent,
+                 uint32_t Size, bool IsElided);
+  virtual ~LayoutItemBase() {}
 
-  virtual uint32_t deepPaddingSize() const;
+  uint32_t deepPaddingSize() const;
+  virtual uint32_t immediatePadding() const { return 0; }
+  virtual uint32_t tailPadding() const;
 
-  const UDTLayoutBase &getParent() const { return Parent; }
+  const UDTLayoutBase *getParent() const { return Parent; }
   StringRef getName() const { return Name; }
   uint32_t getOffsetInParent() const { return OffsetInParent; }
   uint32_t getSize() const { return SizeOf; }
-  const PDBSymbol &getSymbol() const { return Symbol; }
+  uint32_t getLayoutSize() const { return LayoutSize; }
+  const PDBSymbol *getSymbol() const { return Symbol; }
+  const BitVector &usedBytes() const { return UsedBytes; }
+  bool isElided() const { return IsElided; }
+  virtual bool isVBPtr() const { return false; }
+
+  uint32_t containsOffset(uint32_t Off) const {
+    uint32_t Begin = getOffsetInParent();
+    uint32_t End = Begin + getSize();
+    return (Off >= Begin && Off < End);
+  }
 
 protected:
-  const UDTLayoutBase &Parent;
-  const PDBSymbol &Symbol;
+  const PDBSymbol *Symbol = nullptr;
+  const UDTLayoutBase *Parent = nullptr;
   BitVector UsedBytes;
   std::string Name;
   uint32_t OffsetInParent = 0;
   uint32_t SizeOf = 0;
+  uint32_t LayoutSize = 0;
+  bool IsElided = false;
+};
+
+class VBPtrLayoutItem : public LayoutItemBase {
+public:
+  VBPtrLayoutItem(const UDTLayoutBase &Parent,
+                  std::unique_ptr<PDBSymbolTypeBuiltin> Sym, uint32_t Offset,
+                  uint32_t Size);
+  virtual bool isVBPtr() const { return true; }
+
+private:
+  std::unique_ptr<PDBSymbolTypeBuiltin> Type;
 };
 
-class DataMemberLayoutItem : public StorageItemBase {
+class DataMemberLayoutItem : public LayoutItemBase {
 public:
   DataMemberLayoutItem(const UDTLayoutBase &Parent,
                        std::unique_ptr<PDBSymbolData> DataMember);
 
-  virtual uint32_t deepPaddingSize() const;
-
   const PDBSymbolData &getDataMember();
   bool hasUDTLayout() const;
   const ClassLayout &getUDTLayout() const;
@@ -75,77 +99,73 @@ private:
   std::unique_ptr<ClassLayout> UdtLayout;
 };
 
-class VTableLayoutItem : public StorageItemBase {
+class VTableLayoutItem : public LayoutItemBase {
 public:
   VTableLayoutItem(const UDTLayoutBase &Parent,
                    std::unique_ptr<PDBSymbolTypeVTable> VTable);
-  ArrayRef<PDBSymbolFunc *> funcs() const { return VTableFuncs; }
 
   uint32_t getElementSize() const { return ElementSize; }
 
-  void setFunction(uint32_t Index, PDBSymbolFunc &Func) {
-    VTableFuncs[Index] = &Func;
-  }
-
 private:
   uint32_t ElementSize = 0;
-  std::unique_ptr<PDBSymbolTypeVTableShape> Shape;
   std::unique_ptr<PDBSymbolTypeVTable> VTable;
-  std::vector<PDBSymbolFunc *> VTableFuncs;
 };
 
-class UDTLayoutBase {
+class UDTLayoutBase : public LayoutItemBase {
   template <typename T> using UniquePtrVector = std::vector<std::unique_ptr<T>>;
 
 public:
-  UDTLayoutBase(const PDBSymbol &Symbol, const std::string &Name,
-                uint32_t Size);
-
-  uint32_t shallowPaddingSize() const;
-  uint32_t deepPaddingSize() const;
-
-  const BitVector &usedBytes() const { return UsedBytes; }
+  UDTLayoutBase(const UDTLayoutBase *Parent, const PDBSymbol &Sym,
+                const std::string &Name, uint32_t OffsetInParent, uint32_t Size,
+                bool IsElided);
 
-  uint32_t getClassSize() const { return SizeOf; }
+  uint32_t tailPadding() const override;
 
-  ArrayRef<std::unique_ptr<StorageItemBase>> layout_items() const {
-    return ChildStorage;
-  }
-
-  VTableLayoutItem *findVTableAtOffset(uint32_t RelativeOffset);
+  ArrayRef<LayoutItemBase *> layout_items() const { return LayoutItems; }
 
-  StringRef getUDTName() const { return Name; }
+  ArrayRef<BaseClassLayout *> bases() const { return AllBases; }
+  ArrayRef<BaseClassLayout *> regular_bases() const { return NonVirtualBases; }
+  ArrayRef<BaseClassLayout *> virtual_bases() const { return VirtualBases; }
 
-  ArrayRef<BaseClassLayout *> bases() const { return BaseClasses; }
-  ArrayRef<std::unique_ptr<PDBSymbolTypeBaseClass>> vbases() const {
-    return VirtualBases;
-  }
+  uint32_t directVirtualBaseCount() const { return DirectVBaseCount; }
 
   ArrayRef<std::unique_ptr<PDBSymbolFunc>> funcs() const { return Funcs; }
 
   ArrayRef<std::unique_ptr<PDBSymbol>> other_items() const { return Other; }
 
-  const PDBSymbol &getSymbolBase() const { return SymbolBase; }
-
 protected:
+  bool hasVBPtrAtOffset(uint32_t Off) const;
   void initializeChildren(const PDBSymbol &Sym);
 
-  void addChildToLayout(std::unique_ptr<StorageItemBase> Child);
-  void addVirtualOverride(PDBSymbolFunc &Func);
-  void addVirtualIntro(PDBSymbolFunc &Func);
+  void addChildToLayout(std::unique_ptr<LayoutItemBase> Child);
 
-  const PDBSymbol &SymbolBase;
-  std::string Name;
-  uint32_t SizeOf = 0;
+  uint32_t DirectVBaseCount = 0;
 
-  BitVector UsedBytes;
   UniquePtrVector<PDBSymbol> Other;
   UniquePtrVector<PDBSymbolFunc> Funcs;
-  UniquePtrVector<PDBSymbolTypeBaseClass> VirtualBases;
-  UniquePtrVector<StorageItemBase> ChildStorage;
-  std::vector<std::list<StorageItemBase *>> ChildrenPerByte;
-  std::vector<BaseClassLayout *> BaseClasses;
+  UniquePtrVector<LayoutItemBase> ChildStorage;
+  std::vector<LayoutItemBase *> LayoutItems;
+
+  std::vector<BaseClassLayout *> AllBases;
+  ArrayRef<BaseClassLayout *> NonVirtualBases;
+  ArrayRef<BaseClassLayout *> VirtualBases;
+
   VTableLayoutItem *VTable = nullptr;
+  VBPtrLayoutItem *VBPtr = nullptr;
+};
+
+class BaseClassLayout : public UDTLayoutBase {
+public:
+  BaseClassLayout(const UDTLayoutBase &Parent, uint32_t OffsetInParent,
+                  bool Elide, std::unique_ptr<PDBSymbolTypeBaseClass> Base);
+
+  const PDBSymbolTypeBaseClass &getBase() const { return *Base; }
+  bool isVirtualBase() const { return IsVirtualBase; }
+  bool isEmptyBase() { return SizeOf == 1 && LayoutSize == 0; }
+
+private:
+  std::unique_ptr<PDBSymbolTypeBaseClass> Base;
+  bool IsVirtualBase;
 };
 
 class ClassLayout : public UDTLayoutBase {
@@ -156,24 +176,13 @@ public:
   ClassLayout(ClassLayout &&Other) = default;
 
   const PDBSymbolTypeUDT &getClass() const { return UDT; }
+  uint32_t immediatePadding() const override;
 
 private:
+  BitVector ImmediateUsedBytes;
   std::unique_ptr<PDBSymbolTypeUDT> OwnedStorage;
   const PDBSymbolTypeUDT &UDT;
 };
-
-class BaseClassLayout : public UDTLayoutBase, public StorageItemBase {
-public:
-  BaseClassLayout(const UDTLayoutBase &Parent,
-                  std::unique_ptr<PDBSymbolTypeBaseClass> Base);
-
-  const PDBSymbolTypeBaseClass &getBase() const { return *Base; }
-  bool isVirtualBase() const { return IsVirtualBase; }
-
-private:
-  std::unique_ptr<PDBSymbolTypeBaseClass> Base;
-  bool IsVirtualBase;
-};
 }
 } // namespace llvm