Skip to content

Commit df1b64e

Browse files
bob-wilsonadrian-prantl
authored andcommitted
Update uses of DIBuilder.createPointerType to match LLVM r297320.
This function has a new argument to specify a DWARFAddressSpace value. There is a default value but since it was not added as the last argument, Swift needs to update calls that specify the optional pointer type name argument. (cherry picked from commit 21ddc5c) (cherry picked from commit 915cda6a05cf7c7eddbb79af14a023914cb9cea9)
1 parent 53b4e70 commit df1b64e

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

lib/IRGen/IRGenDebugInfo.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,24 +1437,32 @@ llvm::DIType *IRGenDebugInfo::createType(DebugTypeInfo DbgTy,
14371437
auto IdTy = DBuilder.createForwardDecl(
14381438
llvm::dwarf::DW_TAG_structure_type, MangledName, Scope, File, 0,
14391439
llvm::dwarf::DW_LANG_ObjC, 0, 0);
1440-
return DBuilder.createPointerType(IdTy, PtrSize, 0, MangledName);
1440+
return DBuilder.createPointerType(IdTy, PtrSize, 0,
1441+
/* DWARFAddressSpace */ None,
1442+
MangledName);
14411443
}
14421444

14431445
case TypeKind::BuiltinNativeObject: {
14441446
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0);
1445-
auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0, MangledName);
1447+
auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0,
1448+
/* DWARFAddressSpace */ None,
1449+
MangledName);
14461450
return DBuilder.createObjectPointerType(PTy);
14471451
}
14481452

14491453
case TypeKind::BuiltinBridgeObject: {
14501454
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0);
1451-
auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0, MangledName);
1455+
auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0,
1456+
/* DWARFAddressSpace */ None,
1457+
MangledName);
14521458
return DBuilder.createObjectPointerType(PTy);
14531459
}
14541460

14551461
case TypeKind::BuiltinRawPointer: {
14561462
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0);
1457-
return DBuilder.createPointerType(nullptr, PtrSize, 0, MangledName);
1463+
return DBuilder.createPointerType(nullptr, PtrSize, 0,
1464+
/* DWARFAddressSpace */ None,
1465+
MangledName);
14581466
}
14591467

14601468
case TypeKind::DynamicSelf: {

0 commit comments

Comments
 (0)