[DebugInfo] Generate full debug info for classes

Author: augusto2112

lib/IRGen/IRGenDebugInfo.cpp

@@ -1079,8 +1079,6 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
             llvm::dwarf::DW_TAG_structure_type, UniqueID, Scope, File, Line,
             llvm::dwarf::DW_LANG_Swift, SizeInBits, 0);
     }
-    if (OffsetInBits > SizeInBits)
-      SizeInBits = OffsetInBits;
 
     auto DITy = DBuilder.createStructType(
         Scope, Name, File, Line, SizeInBits, AlignInBits, Flags, DerivedFrom,
@@ -1644,7 +1642,25 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
       unsigned FwdDeclLine = 0;
       assert(SizeInBits ==
              CI.getTargetInfo().getPointerWidth(clang::LangAS::Default));
-      return createPointerSizedStruct(Scope, Decl->getNameStr(), L.File,
+      if (Opts.DebugInfoLevel > IRGenDebugInfoLevel::ASTTypes) {
+        auto *DIType = createStructType(
+            DbgTy, Decl, ClassTy, Scope, File, L.Line, SizeInBits, AlignInBits,
+            Flags, nullptr, llvm::dwarf::DW_LANG_Swift, MangledName);
+        auto SuperClassTy = ClassTy->getSuperclass();
+        if (DIType && SuperClassTy) {
+          auto SuperClassDbgTy = DebugTypeInfo::getFromTypeInfo(
+              SuperClassTy, IGM.getTypeInfoForUnlowered(SuperClassTy), IGM,
+              false);
+
+          llvm::DIType *SuperClassDITy = getOrCreateType(SuperClassDbgTy);
+          if (SuperClassDITy) {
+            DBuilder.retainType(DBuilder.createInheritance(
+                DIType, SuperClassDITy, 0, 0, llvm::DINode::FlagZero));
+          }
+        }
+        return DIType;
+      }
+      return createPointerSizedStruct(Scope, Decl->getNameStr(), File,
                                       FwdDeclLine, Flags, MangledName);
     }
 
@@ -2017,7 +2033,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
   void createSpecialStlibBuiltinTypes() {
     if (Opts.DebugInfoLevel <= IRGenDebugInfoLevel::ASTTypes) 
       return;
-    for (auto BuiltinType: IGM.getSpecialBuiltinTypes()) {
+    for (auto BuiltinType: IGM.getOrCreateSpecialStlibBuiltinTypes()) {
       auto DbgTy = DebugTypeInfo::getFromTypeInfo(
           BuiltinType, IGM.getTypeInfoForUnlowered(BuiltinType), IGM, false);
       DBuilder.retainType(getOrCreateType(DbgTy));