@@ -1120,7 +1120,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
11201120 }
11211121
11221122 llvm::DICompositeType *
1123- createStructType (DebugTypeInfo DbgTy, NominalTypeDecl *Decl, Type BaseTy,
1123+ createStructType (DebugTypeInfo DbgTy, NominalTypeDecl *Decl,
11241124 llvm::DIScope *Scope, llvm::DIFile *File, unsigned Line,
11251125 unsigned SizeInBits, unsigned AlignInBits,
11261126 llvm::DINode::DIFlags Flags, llvm::DIType *DerivedFrom,
@@ -1133,7 +1133,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
11331133 SmallVector<llvm::Metadata *, 16 > Elements;
11341134 unsigned OffsetInBits = 0 ;
11351135 for (VarDecl *VD : Decl->getStoredProperties ()) {
1136- auto memberTy = BaseTy ->getTypeOfMember (VD);
1136+ auto memberTy = DbgTy. getType () ->getTypeOfMember (VD);
11371137
11381138 if (auto DbgTy = CompletedDebugTypeInfo::getFromTypeInfo (
11391139 VD->getInterfaceType (),
@@ -1876,7 +1876,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
18761876 return createSpecializedStructOrClassType (
18771877 StructTy, Scope, L.File , L.Line , SizeInBits, AlignInBits,
18781878 Flags, MangledName);
1879- return createStructType (DbgTy, Decl, StructTy, Scope, L.File , L.Line ,
1879+ return createStructType (DbgTy, Decl, Scope, L.File , L.Line ,
18801880 SizeInBits, AlignInBits, Flags, nullptr ,
18811881 llvm::dwarf::DW_LANG_Swift, MangledName);
18821882 }
@@ -1911,7 +1911,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
19111911 Flags, MangledName);
19121912
19131913 auto *DIType = createStructType (
1914- DbgTy, Decl, ClassTy, Scope, File, L.Line , SizeInBits, AlignInBits,
1914+ DbgTy, Decl, Scope, File, L.Line , SizeInBits, AlignInBits,
19151915 Flags, nullptr , llvm::dwarf::DW_LANG_Swift, MangledName);
19161916 assert (DIType && " Unexpected null DIType!" );
19171917 assert (DIType && " createStructType should never return null!" );
0 commit comments