From ba60f6dc03126d8b26bba5be6338fd8b3580bd25 Mon Sep 17 00:00:00 2001 From: Youngsuk Kim Date: Tue, 5 Nov 2024 10:00:23 -0500 Subject: [PATCH] Remove leftover uses of llvm::Type::getPointerTo() (#114993) `llvm::Type::getPointerTo()` is to be deprecated. Replace remaining uses of it. --- clang/lib/CodeGen/CGObjCMac.cpp | 28 ++++++++++++--------------- llvm/tools/bugpoint/CrashDebugger.cpp | 2 +- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index 47ea636c756438..7caf801d22e0b1 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -365,7 +365,7 @@ class ObjCCommonTypesHelper { /// GcReadWeakFn -- LLVM objc_read_weak (id *src) function. llvm::FunctionCallee getGcReadWeakFn() { // id objc_read_weak (id *) - llvm::Type *args[] = { ObjectPtrTy->getPointerTo() }; + llvm::Type *args[] = {CGM.UnqualPtrTy}; llvm::FunctionType *FTy = llvm::FunctionType::get(ObjectPtrTy, args, false); return CGM.CreateRuntimeFunction(FTy, "objc_read_weak"); @@ -374,7 +374,7 @@ class ObjCCommonTypesHelper { /// GcAssignWeakFn -- LLVM objc_assign_weak function. llvm::FunctionCallee getGcAssignWeakFn() { // id objc_assign_weak (id, id *) - llvm::Type *args[] = { ObjectPtrTy, ObjectPtrTy->getPointerTo() }; + llvm::Type *args[] = {ObjectPtrTy, CGM.UnqualPtrTy}; llvm::FunctionType *FTy = llvm::FunctionType::get(ObjectPtrTy, args, false); return CGM.CreateRuntimeFunction(FTy, "objc_assign_weak"); @@ -383,7 +383,7 @@ class ObjCCommonTypesHelper { /// GcAssignGlobalFn -- LLVM objc_assign_global function. llvm::FunctionCallee getGcAssignGlobalFn() { // id objc_assign_global(id, id *) - llvm::Type *args[] = { ObjectPtrTy, ObjectPtrTy->getPointerTo() }; + llvm::Type *args[] = {ObjectPtrTy, CGM.UnqualPtrTy}; llvm::FunctionType *FTy = llvm::FunctionType::get(ObjectPtrTy, args, false); return CGM.CreateRuntimeFunction(FTy, "objc_assign_global"); @@ -392,7 +392,7 @@ class ObjCCommonTypesHelper { /// GcAssignThreadLocalFn -- LLVM objc_assign_threadlocal function. llvm::FunctionCallee getGcAssignThreadLocalFn() { // id objc_assign_threadlocal(id src, id * dest) - llvm::Type *args[] = { ObjectPtrTy, ObjectPtrTy->getPointerTo() }; + llvm::Type *args[] = {ObjectPtrTy, CGM.UnqualPtrTy}; llvm::FunctionType *FTy = llvm::FunctionType::get(ObjectPtrTy, args, false); return CGM.CreateRuntimeFunction(FTy, "objc_assign_threadlocal"); @@ -401,8 +401,7 @@ class ObjCCommonTypesHelper { /// GcAssignIvarFn -- LLVM objc_assign_ivar function. llvm::FunctionCallee getGcAssignIvarFn() { // id objc_assign_ivar(id, id *, ptrdiff_t) - llvm::Type *args[] = { ObjectPtrTy, ObjectPtrTy->getPointerTo(), - CGM.PtrDiffTy }; + llvm::Type *args[] = {ObjectPtrTy, CGM.UnqualPtrTy, CGM.PtrDiffTy}; llvm::FunctionType *FTy = llvm::FunctionType::get(ObjectPtrTy, args, false); return CGM.CreateRuntimeFunction(FTy, "objc_assign_ivar"); @@ -419,7 +418,7 @@ class ObjCCommonTypesHelper { /// GcAssignStrongCastFn -- LLVM objc_assign_strongCast function. llvm::FunctionCallee getGcAssignStrongCastFn() { // id objc_assign_strongCast(id, id *) - llvm::Type *args[] = { ObjectPtrTy, ObjectPtrTy->getPointerTo() }; + llvm::Type *args[] = {ObjectPtrTy, CGM.UnqualPtrTy}; llvm::FunctionType *FTy = llvm::FunctionType::get(ObjectPtrTy, args, false); return CGM.CreateRuntimeFunction(FTy, "objc_assign_strongCast"); @@ -554,7 +553,7 @@ class ObjCTypesHelper : public ObjCCommonTypesHelper { /// ExceptionTryEnterFn - LLVM objc_exception_try_enter function. llvm::FunctionCallee getExceptionTryEnterFn() { - llvm::Type *params[] = { ExceptionDataTy->getPointerTo() }; + llvm::Type *params[] = {CGM.UnqualPtrTy}; return CGM.CreateRuntimeFunction( llvm::FunctionType::get(CGM.VoidTy, params, false), "objc_exception_try_enter"); @@ -562,7 +561,7 @@ class ObjCTypesHelper : public ObjCCommonTypesHelper { /// ExceptionTryExitFn - LLVM objc_exception_try_exit function. llvm::FunctionCallee getExceptionTryExitFn() { - llvm::Type *params[] = { ExceptionDataTy->getPointerTo() }; + llvm::Type *params[] = {CGM.UnqualPtrTy}; return CGM.CreateRuntimeFunction( llvm::FunctionType::get(CGM.VoidTy, params, false), "objc_exception_try_exit"); @@ -570,7 +569,7 @@ class ObjCTypesHelper : public ObjCCommonTypesHelper { /// ExceptionExtractFn - LLVM objc_exception_extract function. llvm::FunctionCallee getExceptionExtractFn() { - llvm::Type *params[] = { ExceptionDataTy->getPointerTo() }; + llvm::Type *params[] = {CGM.UnqualPtrTy}; return CGM.CreateRuntimeFunction(llvm::FunctionType::get(ObjectPtrTy, params, false), "objc_exception_extract"); @@ -587,7 +586,7 @@ class ObjCTypesHelper : public ObjCCommonTypesHelper { /// SetJmpFn - LLVM _setjmp function. llvm::FunctionCallee getSetJmpFn() { // This is specifically the prototype for x86. - llvm::Type *params[] = { CGM.Int32Ty->getPointerTo() }; + llvm::Type *params[] = {CGM.UnqualPtrTy}; return CGM.CreateRuntimeFunction( llvm::FunctionType::get(CGM.Int32Ty, params, false), "_setjmp", llvm::AttributeList::get(CGM.getLLVMContext(), @@ -6051,9 +6050,7 @@ ObjCNonFragileABITypesHelper::ObjCNonFragileABITypesHelper(CodeGen::CodeGenModul Int8PtrTy, PropertyListPtrTy); // ImpnfABITy - LLVM for id (*)(id, SEL, ...) - llvm::Type *params[] = { ObjectPtrTy, SelectorPtrTy }; - ImpnfABITy = llvm::FunctionType::get(ObjectPtrTy, params, false) - ->getPointerTo(); + ImpnfABITy = CGM.UnqualPtrTy; // struct _class_t { // struct _class_t *isa; @@ -6469,8 +6466,7 @@ void CGObjCNonFragileABIMac::GenerateClass(const ObjCImplementationDecl *ID) { llvm::GlobalValue::ExternalLinkage, nullptr, "_objc_empty_vtable"); else - ObjCEmptyVtableVar = - llvm::ConstantPointerNull::get(ObjCTypes.ImpnfABITy->getPointerTo()); + ObjCEmptyVtableVar = llvm::ConstantPointerNull::get(CGM.UnqualPtrTy); } // FIXME: Is this correct (that meta class size is never computed)? diff --git a/llvm/tools/bugpoint/CrashDebugger.cpp b/llvm/tools/bugpoint/CrashDebugger.cpp index e1a732f4b01921..7dbbf73679584f 100644 --- a/llvm/tools/bugpoint/CrashDebugger.cpp +++ b/llvm/tools/bugpoint/CrashDebugger.cpp @@ -245,7 +245,7 @@ static void RemoveFunctionReferences(Module *M, const char *Name) { auto *NewValElemTy = OldUsedVal->getType()->getElementType(); auto *NewValTy = ArrayType::get(NewValElemTy, Used.size()); auto *NewUsedVal = ConstantArray::get(NewValTy, Used); - UsedVar->mutateType(NewUsedVal->getType()->getPointerTo()); + UsedVar->mutateType(PointerType::getUnqual(M->getContext())); UsedVar->setInitializer(NewUsedVal); }