Merge pull request #62587 from adrian-prantl/bitsvsbytes

Fix a bit versus byte confusion.

Author: swift-ci

lib/IRGen/IRGenDebugInfo.cpp

@@ -2918,9 +2918,11 @@ void IRGenDebugInfoImpl::emitTypeMetadata(IRGenFunction &IGF,
   static const char *Tau = u8"\u03C4";
   llvm::raw_svector_ostream OS(Buf);
   OS << '$' << Tau << '_' << Depth << '_' << Index;
+  uint64_t PtrWidthInBits = CI.getTargetInfo().getPointerWidth(0);
+  assert(PtrWidthInBits % 8 == 0);
   auto DbgTy = DebugTypeInfo::getTypeMetadata(
       getMetadataType(Name)->getDeclaredInterfaceType().getPointer(),
-      Metadata->getType(), Size(CI.getTargetInfo().getPointerWidth(0)),
+      Metadata->getType(), Size(PtrWidthInBits / 8),
       Alignment(CI.getTargetInfo().getPointerAlign(0)));
   emitVariableDeclaration(IGF.Builder, Metadata, DbgTy, IGF.getDebugScope(),
                           {}, {OS.str().str(), 0, false},
@@ -2931,7 +2933,8 @@ void IRGenDebugInfoImpl::emitTypeMetadata(IRGenFunction &IGF,
                           ArtificialValue);
 }
 
-SILLocation::FilenameAndLocation IRGenDebugInfoImpl::decodeSourceLoc(SourceLoc SL) {
+SILLocation::FilenameAndLocation
+IRGenDebugInfoImpl::decodeSourceLoc(SourceLoc SL) {
   auto &Cached = FilenameAndLocationCache[SL.getOpaquePointerValue()];
   if (Cached.filename.empty())
     Cached = sanitizeCodeViewFilenameAndLocation(SILLocation::decode(SL, SM));

test/DebugInfo/EagerTypeMetadata.swift

@@ -8,8 +8,11 @@ public class C<T>
     // CHECK: define {{.*}} @"$s17EagerTypeMetadata1CC1cyyxF"
     // CHECK: %T = load %swift.type*, %swift.type**
     // CHECK-SAME: !dbg ![[LOC:[0-9]+]], !invariant.load
-    // CHECK: ![[LOC]] = !DILocation(line: 0,
     var x = [i]
   }
 }
+// CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "T",
+// CHECK-SAME:           baseType: ![[PTRTY:[0-9]+]]
+// CHECK: ![[PTRTY]] = !DIDerivedType(tag: DW_TAG_pointer_type, name: "$sBpD", baseType: null, size: {{64|32}})
+// CHECK: ![[LOC]] = !DILocation(line: 0,