Merge pull request #37624 from adrian-prantl/76973844-review-feedback-next

Address review feedback

Author: adrian-prantl

lib/IRGen/DebugTypeInfo.h

@@ -128,7 +128,7 @@ class CompletedDebugTypeInfo : public DebugTypeInfo {
         DebugTypeInfo::getFromTypeInfo(Ty, Info));
   }
 
-  Size::int_type getSizeValue() const { return size.getValue().getValue(); }
+  Size::int_type getSizeValue() const { return size->getValue(); }
 };
 
 }

lib/IRGen/IRGenDebugInfo.cpp

@@ -1021,12 +1021,11 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     return getOrCreateType(BlandDbgTy);
   }
 
-  uint64_t getSizeOfBasicType(DebugTypeInfo DbgTy) {
+  uint64_t getSizeOfBasicType(CompletedDebugTypeInfo DbgTy) {
     uint64_t SizeOfByte = CI.getTargetInfo().getCharWidth();
     uint64_t BitWidth = 0;
-    assert(DbgTy.getSize() && "non-fixed basic type");
     if (DbgTy.getSize())
-      BitWidth = DbgTy.getSize()->getValue() * SizeOfByte;
+      BitWidth = DbgTy.getSizeValue() * SizeOfByte;
     llvm::Type *StorageType = DbgTy.getStorageType()
                                   ? DbgTy.getStorageType()
                                   : IGM.DataLayout.getSmallestLegalIntType(
@@ -1288,13 +1287,15 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     switch (BaseTy->getKind()) {
     case TypeKind::BuiltinInteger: {
       Encoding = llvm::dwarf::DW_ATE_unsigned;
-      SizeInBits = getSizeOfBasicType(DbgTy);
+      if (auto CompletedDbgTy = CompletedDebugTypeInfo::get(DbgTy))
+        SizeInBits = getSizeOfBasicType(*CompletedDbgTy);
       break;
     }
 
     case TypeKind::BuiltinIntegerLiteral: {
       Encoding = llvm::dwarf::DW_ATE_unsigned; // ?
-      SizeInBits = getSizeOfBasicType(DbgTy);
+      if (auto CompletedDbgTy = CompletedDebugTypeInfo::get(DbgTy))
+        SizeInBits = getSizeOfBasicType(*CompletedDbgTy);
       break;
     }