averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update clang TargetInfo AddressSpace API usage

Browse Source 
The TargetInfo pointer APIs updated to taking an "AddressSpace" type
instead of a raw integer. This goes through and updates the call
locations where this change caused build failures. In all cases, the
value passed was `0`, corresponding with the Default AddressSpace.
This commit is contained in:
Evan Wilde
2023-07-24 12:56:27 -07:00
parent f4946e9718
commit ecbccb9310
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/IRGen/IRGenDebugInfo.cpp
View File

@@ -1179,7 +1179,7 @@ private:
return createPointerSizedStruct(Scope, Name, FwdDecl, File, Line, Flags, return createPointerSizedStruct(Scope, Name, FwdDecl, File, Line, Flags,
MangledName); MangledName);
} else { } else {
unsigned SizeInBits = CI.getTargetInfo().getPointerWidth(0); unsigned SizeInBits = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
return createOpaqueStruct(Scope, Name, File, Line, SizeInBits, 0, Flags, return createOpaqueStruct(Scope, Name, File, Line, SizeInBits, 0, Flags,
MangledName); MangledName);
} }
@@ -1190,7 +1190,7 @@ private:
llvm::DIFile *File, unsigned Line, llvm::DIFile *File, unsigned Line,
llvm::DINode::DIFlags Flags, llvm::DINode::DIFlags Flags,
StringRef MangledName) { StringRef MangledName) {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
auto PtrTy = DBuilder.createPointerType(PointeeTy, PtrSize, 0); auto PtrTy = DBuilder.createPointerType(PointeeTy, PtrSize, 0);
llvm::Metadata *Elements[] = {DBuilder.createMemberType( llvm::Metadata *Elements[] = {DBuilder.createMemberType(
Scope, "ptr", File, 0, PtrSize, 0, 0, Flags, PtrTy)}; Scope, "ptr", File, 0, PtrSize, 0, 0, Flags, PtrTy)};
@@ -1205,7 +1205,7 @@ private:
llvm::DIType *PointeeTy, llvm::DIFile *File, llvm::DIType *PointeeTy, llvm::DIFile *File,
unsigned Line, llvm::DINode::DIFlags Flags, unsigned Line, llvm::DINode::DIFlags Flags,
StringRef MangledName) { StringRef MangledName) {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
llvm::Metadata *Elements[] = { llvm::Metadata *Elements[] = {
DBuilder.createMemberType( DBuilder.createMemberType(
Scope, "ptr", File, 0, PtrSize, 0, 0, Flags, Scope, "ptr", File, 0, PtrSize, 0, 0, Flags,
@@ -1221,7 +1221,7 @@ private:
llvm::DIType *createFixedValueBufferStruct(llvm::DIType *PointeeTy) { llvm::DIType *createFixedValueBufferStruct(llvm::DIType *PointeeTy) {
unsigned Line = 0; unsigned Line = 0;
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
llvm::DINode::DIFlags Flags = llvm::DINode::FlagArtificial; llvm::DINode::DIFlags Flags = llvm::DINode::FlagArtificial;
llvm::DIFile *File = MainFile; llvm::DIFile *File = MainFile;
llvm::DIScope *Scope = TheCU; llvm::DIScope *Scope = TheCU;
@@ -1265,7 +1265,7 @@ private:
auto FnTy = DBuilder.createSubroutineType(Params, Flags); auto FnTy = DBuilder.createSubroutineType(Params, Flags);
llvm::DIType *DITy; llvm::DIType *DITy;
if (FunTy->getRepresentation() == SILFunctionType::Representation::Thick) { if (FunTy->getRepresentation() == SILFunctionType::Representation::Thick) {
if (SizeInBits == 2 * CI.getTargetInfo().getPointerWidth(0)) if (SizeInBits == 2 * CI.getTargetInfo().getPointerWidth(clang::LangAS::Default))
// This is a FunctionPairTy: { i8*, %swift.refcounted* }. // This is a FunctionPairTy: { i8*, %swift.refcounted* }.
DITy = createDoublePointerSizedStruct(Scope, MangledName, FnTy, DITy = createDoublePointerSizedStruct(Scope, MangledName, FnTy,
MainFile, 0, Flags, MangledName); MainFile, 0, Flags, MangledName);
@@ -1274,7 +1274,7 @@ private:
DITy = createOpaqueStruct(Scope, MangledName, MainFile, 0, SizeInBits, DITy = createOpaqueStruct(Scope, MangledName, MainFile, 0, SizeInBits,
AlignInBits, Flags, MangledName); AlignInBits, Flags, MangledName);
} else { } else {
assert(SizeInBits == CI.getTargetInfo().getPointerWidth(0)); assert(SizeInBits == CI.getTargetInfo().getPointerWidth(clang::LangAS::Default));
DITy = createPointerSizedStruct(Scope, MangledName, FnTy, MainFile, 0, DITy = createPointerSizedStruct(Scope, MangledName, FnTy, MainFile, 0,
Flags, MangledName); Flags, MangledName);
} }
@@ -1394,7 +1394,7 @@ private:
} }
case TypeKind::BuiltinNativeObject: { case TypeKind::BuiltinNativeObject: {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0, auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0,
/* DWARFAddressSpace */ llvm::None, /* DWARFAddressSpace */ llvm::None,
MangledName); MangledName);
@@ -1402,7 +1402,7 @@ private:
} }
case TypeKind::BuiltinBridgeObject: { case TypeKind::BuiltinBridgeObject: {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0, auto PTy = DBuilder.createPointerType(nullptr, PtrSize, 0,
/* DWARFAddressSpace */ llvm::None, /* DWARFAddressSpace */ llvm::None,
MangledName); MangledName);
@@ -1410,21 +1410,21 @@ private:
} }
case TypeKind::BuiltinRawPointer: { case TypeKind::BuiltinRawPointer: {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
return DBuilder.createPointerType(nullptr, PtrSize, 0, return DBuilder.createPointerType(nullptr, PtrSize, 0,
/* DWARFAddressSpace */ llvm::None, /* DWARFAddressSpace */ llvm::None,
MangledName); MangledName);
} }
case TypeKind::BuiltinRawUnsafeContinuation: { case TypeKind::BuiltinRawUnsafeContinuation: {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
return DBuilder.createPointerType(nullptr, PtrSize, 0, return DBuilder.createPointerType(nullptr, PtrSize, 0,
/* DWARFAddressSpace */ llvm::None, /* DWARFAddressSpace */ llvm::None,
MangledName); MangledName);
} }
case TypeKind::BuiltinJob: { case TypeKind::BuiltinJob: {
unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0); unsigned PtrSize = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
return DBuilder.createPointerType(nullptr, PtrSize, 0, return DBuilder.createPointerType(nullptr, PtrSize, 0,
/* DWARFAddressSpace */ llvm::None, /* DWARFAddressSpace */ llvm::None,
MangledName); MangledName);
@@ -1483,7 +1483,7 @@ private:
auto L = getFilenameAndLocation(*this, Decl); auto L = getFilenameAndLocation(*this, Decl);
auto *File = getOrCreateFile(L.filename); auto *File = getOrCreateFile(L.filename);
unsigned FwdDeclLine = 0; unsigned FwdDeclLine = 0;
assert(SizeInBits == CI.getTargetInfo().getPointerWidth(0)); assert(SizeInBits == CI.getTargetInfo().getPointerWidth(clang::LangAS::Default));
return createPointerSizedStruct(Scope, Decl->getNameStr(), File, return createPointerSizedStruct(Scope, Decl->getNameStr(), File,
FwdDeclLine, Flags, MangledName); FwdDeclLine, Flags, MangledName);
} }
@@ -1518,7 +1518,7 @@ private:
auto L = getFilenameAndLocation(*this, Decl); auto L = getFilenameAndLocation(*this, Decl);
auto *File = getOrCreateFile(L.filename); auto *File = getOrCreateFile(L.filename);
unsigned FwdDeclLine = 0; unsigned FwdDeclLine = 0;
assert(SizeInBits == CI.getTargetInfo().getPointerWidth(0)); assert(SizeInBits == CI.getTargetInfo().getPointerWidth(clang::LangAS::Default));
return createPointerSizedStruct(Scope, return createPointerSizedStruct(Scope,
Decl ? Decl->getNameStr() : MangledName, Decl ? Decl->getNameStr() : MangledName,
File, FwdDeclLine, Flags, MangledName); File, FwdDeclLine, Flags, MangledName);
@@ -1544,7 +1544,7 @@ private:
// TODO: We may want to peek at Decl->isObjC() and set this // TODO: We may want to peek at Decl->isObjC() and set this
// attribute accordingly. // attribute accordingly.
assert(SizeInBits == CI.getTargetInfo().getPointerWidth(0)); assert(SizeInBits == CI.getTargetInfo().getPointerWidth(clang::LangAS::Default));
return createPointerSizedStruct(Scope, return createPointerSizedStruct(Scope,
Decl ? Decl->getNameStr() : MangledName, Decl ? Decl->getNameStr() : MangledName,
File, FwdDeclLine, Flags, MangledName); File, FwdDeclLine, Flags, MangledName);
@@ -3039,12 +3039,12 @@ void IRGenDebugInfoImpl::emitTypeMetadata(IRGenFunction &IGF,
static const char *Tau = u8"\u03C4"; static const char *Tau = u8"\u03C4";
llvm::raw_svector_ostream OS(Buf); llvm::raw_svector_ostream OS(Buf);
OS << '$' << Tau << '_' << Depth << '_' << Index; OS << '$' << Tau << '_' << Depth << '_' << Index;
uint64_t PtrWidthInBits = CI.getTargetInfo().getPointerWidth(0); uint64_t PtrWidthInBits = CI.getTargetInfo().getPointerWidth(clang::LangAS::Default);
assert(PtrWidthInBits % 8 == 0); assert(PtrWidthInBits % 8 == 0);
auto DbgTy = DebugTypeInfo::getTypeMetadata( auto DbgTy = DebugTypeInfo::getTypeMetadata(
getMetadataType(Name)->getDeclaredInterfaceType().getPointer(), getMetadataType(Name)->getDeclaredInterfaceType().getPointer(),
Metadata->getType(), Size(PtrWidthInBits / 8), Metadata->getType(), Size(PtrWidthInBits / 8),
Alignment(CI.getTargetInfo().getPointerAlign(0))); Alignment(CI.getTargetInfo().getPointerAlign(clang::LangAS::Default)));
emitVariableDeclaration(IGF.Builder, Metadata, DbgTy, IGF.getDebugScope(), emitVariableDeclaration(IGF.Builder, Metadata, DbgTy, IGF.getDebugScope(),
{}, {OS.str().str(), 0, false}, {}, {OS.str().str(), 0, false},
// swift.type is already a pointer type, // swift.type is already a pointer type,
@@ -3065,7 +3065,7 @@ void IRGenDebugInfoImpl::emitPackCountParameter(IRGenFunction &IGF,
if (!DS || DS->getInlinedFunction()->isTransparent()) if (!DS || DS->getInlinedFunction()->isTransparent())
return; return;
Type IntTy = BuiltinIntegerType::get(CI.getTargetInfo().getPointerWidth(0), Type IntTy = BuiltinIntegerType::get(CI.getTargetInfo().getPointerWidth(clang::LangAS::Default),
IGM.getSwiftModule()->getASTContext()); IGM.getSwiftModule()->getASTContext());
auto &TI = IGM.getTypeInfoForUnlowered(IntTy); auto &TI = IGM.getTypeInfoForUnlowered(IntTy);
auto DbgTy = *CompletedDebugTypeInfo::getFromTypeInfo(IntTy, TI, IGM); auto DbgTy = *CompletedDebugTypeInfo::getFromTypeInfo(IntTy, TI, IGM);

3
lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp
View File

@@ -19,6 +19,7 @@
#include "swift/AST/Type.h" #include "swift/AST/Type.h"
#include "swift/IRGen/IRABIDetailsProvider.h" #include "swift/IRGen/IRABIDetailsProvider.h"
#include "swift/IRGen/Linking.h" #include "swift/IRGen/Linking.h"
#include "clang/Basic/AddressSpaces.h"
#include "clang/Basic/TargetInfo.h" #include "clang/Basic/TargetInfo.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
@@ -178,7 +179,7 @@ void printPrimitiveGenericTypeTraits(raw_ostream &os, ASTContext &astContext,
auto &clangTI = auto &clangTI =
astContext.getClangModuleLoader()->getClangASTContext().getTargetInfo(); astContext.getClangModuleLoader()->getClangASTContext().getTargetInfo();
bool isSwiftIntLong = bool isSwiftIntLong =
clangTI.getPtrDiffType(0) == clang::TransferrableTargetInfo::SignedLong; clangTI.getPtrDiffType(clang::LangAS::Default) == clang::TransferrableTargetInfo::SignedLong;
bool isInt64Long = bool isInt64Long =
clangTI.getInt64Type() == clang::TransferrableTargetInfo::SignedLong; clangTI.getInt64Type() == clang::TransferrableTargetInfo::SignedLong;
if (!(isSwiftIntLong && !isInt64Long)) if (!(isSwiftIntLong && !isInt64Long))