[llvm] be215e7 - [SPIR-V] Remove calls to deprecated PointerType methods (1/2) (#68336)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 18 21:50:50 PDT 2023
Author: Michal Paszkowski
Date: 2023-10-18T21:50:46-07:00
New Revision: be215e76d7139f2429e06671620900f58202bdbb
URL: https://github.com/llvm/llvm-project/commit/be215e76d7139f2429e06671620900f58202bdbb
DIFF: https://github.com/llvm/llvm-project/commit/be215e76d7139f2429e06671620900f58202bdbb.diff
LOG: [SPIR-V] Remove calls to deprecated PointerType methods (1/2) (#68336)
Added:
Modified:
llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
index ef527cd4af4c60d..0e3fcf4701e6227 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
@@ -594,12 +594,6 @@ SPIRVType *SPIRVGlobalRegistry::getOpTypeStruct(const StructType *Ty,
SPIRVType *SPIRVGlobalRegistry::getOrCreateSpecialType(
const Type *Ty, MachineIRBuilder &MIRBuilder,
SPIRV::AccessQualifier::AccessQualifier AccQual) {
- // Some OpenCL and SPIRV builtins like image2d_t are passed in as
- // pointers, but should be treated as custom types like OpTypeImage.
- if (auto PType = dyn_cast<PointerType>(Ty)) {
- assert(!PType->isOpaque());
- Ty = PType->getNonOpaquePointerElementType();
- }
assert(isSpecialOpaqueType(Ty) && "Not a special opaque builtin type");
return SPIRV::lowerBuiltinType(Ty, AccQual, MIRBuilder, this);
}
@@ -755,13 +749,10 @@ SPIRVType *SPIRVGlobalRegistry::restOfCreateSPIRVType(
!isSpecialOpaqueType(Ty)) {
if (!Ty->isPointerTy())
DT.add(Ty, &MIRBuilder.getMF(), getSPIRVTypeID(SpirvType));
- else if (Ty->isOpaquePointerTy())
+ else
DT.add(Type::getInt8Ty(MIRBuilder.getMF().getFunction().getContext()),
Ty->getPointerAddressSpace(), &MIRBuilder.getMF(),
getSPIRVTypeID(SpirvType));
- else
- DT.add(Ty->getNonOpaquePointerElementType(), Ty->getPointerAddressSpace(),
- &MIRBuilder.getMF(), getSPIRVTypeID(SpirvType));
}
return SpirvType;
More information about the llvm-commits
mailing list