Skip to content

Commit ad52c9c

Browse files
bjopebjope
committed
[IR] Deprecate some old methods for getting typed pointer types
The convenience methods that now are marked as deprecated are no long used in-tree. The getInt8PtrTy helper is however still used in many places, so it is not marked as deprecated to make it possible to build LLVM with -Werror. Differential Revision: https://reviews.llvm.org/D156741
1 parent 87f2dee commit ad52c9c

File tree

2 files changed

+62
-73
lines changed

2 files changed

+62
-73
lines changed

‎llvm/include/llvm/IR/Type.h

Lines changed: 61 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -481,24 +481,69 @@ class Type {
481481
static Type *getFloatingPointTy(LLVMContext &C, const fltSemantics &S);
482482

483483
//===--------------------------------------------------------------------===//
484-
// Convenience methods for getting pointer types with one of the above builtin
485-
// types as pointee.
484+
// Convenience methods for getting pointer types.
486485
//
487-
static PointerType *getHalfPtrTy(LLVMContext &C, unsigned AS = 0);
488-
static PointerType *getBFloatPtrTy(LLVMContext &C, unsigned AS = 0);
489-
static PointerType *getFloatPtrTy(LLVMContext &C, unsigned AS = 0);
490-
static PointerType *getDoublePtrTy(LLVMContext &C, unsigned AS = 0);
491-
static PointerType *getX86_FP80PtrTy(LLVMContext &C, unsigned AS = 0);
492-
static PointerType *getFP128PtrTy(LLVMContext &C, unsigned AS = 0);
493-
static PointerType *getPPC_FP128PtrTy(LLVMContext &C, unsigned AS = 0);
494-
static PointerType *getX86_MMXPtrTy(LLVMContext &C, unsigned AS = 0);
495-
static PointerType *getX86_AMXPtrTy(LLVMContext &C, unsigned AS = 0);
496-
static PointerType *getIntNPtrTy(LLVMContext &C, unsigned N, unsigned AS = 0);
497-
static PointerType *getInt1PtrTy(LLVMContext &C, unsigned AS = 0);
486+
487+
// TODO: After opaque pointer transition these can be replaced by simply
488+
// calling PointerType::get(C, AS).
498489
static PointerType *getInt8PtrTy(LLVMContext &C, unsigned AS = 0);
499-
static PointerType *getInt16PtrTy(LLVMContext &C, unsigned AS = 0);
500-
static PointerType *getInt32PtrTy(LLVMContext &C, unsigned AS = 0);
501-
static PointerType *getInt64PtrTy(LLVMContext &C, unsigned AS = 0);
490+
[[deprecated("Pointers no longer have element types")]]
491+
inline PointerType *getHalfPtrTy(LLVMContext &C, unsigned AS = 0) {
492+
return getInt8PtrTy(C, AS);
493+
}
494+
[[deprecated("Pointers no longer have element types")]]
495+
inline PointerType *getBFloatPtrTy(LLVMContext &C, unsigned AS = 0) {
496+
return getInt8PtrTy(C, AS);
497+
}
498+
[[deprecated("Pointers no longer have element types")]]
499+
inline PointerType *getFloatPtrTy(LLVMContext &C, unsigned AS = 0) {
500+
return getInt8PtrTy(C, AS);
501+
}
502+
[[deprecated("Pointers no longer have element types")]]
503+
inline PointerType *getDoublePtrTy(LLVMContext &C, unsigned AS = 0) {
504+
return getInt8PtrTy(C, AS);
505+
}
506+
[[deprecated("Pointers no longer have element types")]]
507+
inline PointerType *getX86_FP80PtrTy(LLVMContext &C, unsigned AS = 0) {
508+
return getInt8PtrTy(C, AS);
509+
}
510+
[[deprecated("Pointers no longer have element types")]]
511+
inline PointerType *getFP128PtrTy(LLVMContext &C, unsigned AS = 0) {
512+
return getInt8PtrTy(C, AS);
513+
}
514+
[[deprecated("Pointers no longer have element types")]]
515+
inline PointerType *getPPC_FP128PtrTy(LLVMContext &C, unsigned AS = 0) {
516+
return getInt8PtrTy(C, AS);
517+
}
518+
[[deprecated("Pointers no longer have element types")]]
519+
inline PointerType *getX86_MMXPtrTy(LLVMContext &C, unsigned AS = 0) {
520+
return getInt8PtrTy(C, AS);
521+
}
522+
[[deprecated("Pointers no longer have element types")]]
523+
inline PointerType *getX86_AMXPtrTy(LLVMContext &C, unsigned AS = 0) {
524+
return getInt8PtrTy(C, AS);
525+
}
526+
[[deprecated("Pointers no longer have element types")]]
527+
inline PointerType *getIntNPtrTy(LLVMContext &C, unsigned N, unsigned AS = 0) {
528+
return getInt8PtrTy(C, AS);
529+
}
530+
[[deprecated("Pointers no longer have element types")]]
531+
inline PointerType *getInt1PtrTy(LLVMContext &C, unsigned AS = 0) {
532+
return getInt8PtrTy(C, AS);
533+
}
534+
[[deprecated("Pointers no longer have element types")]]
535+
inline PointerType *getInt16PtrTy(LLVMContext &C, unsigned AS = 0) {
536+
return getInt8PtrTy(C, AS);
537+
}
538+
[[deprecated("Pointers no longer have element types")]]
539+
inline PointerType *getInt32PtrTy(LLVMContext &C, unsigned AS = 0) {
540+
return getInt8PtrTy(C, AS);
541+
}
542+
[[deprecated("Pointers no longer have element types")]]
543+
inline PointerType *getInt64PtrTy(LLVMContext &C, unsigned AS = 0) {
544+
return getInt8PtrTy(C, AS);
545+
}
546+
502547
static Type *getWasm_ExternrefTy(LLVMContext &C);
503548
static Type *getWasm_FuncrefTy(LLVMContext &C);
504549

‎llvm/lib/IR/Type.cpp

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -254,64 +254,8 @@ IntegerType *Type::getIntNTy(LLVMContext &C, unsigned N) {
254254
return IntegerType::get(C, N);
255255
}
256256

257-
PointerType *Type::getHalfPtrTy(LLVMContext &C, unsigned AS) {
258-
return getHalfTy(C)->getPointerTo(AS);
259-
}
260-
261-
PointerType *Type::getBFloatPtrTy(LLVMContext &C, unsigned AS) {
262-
return getBFloatTy(C)->getPointerTo(AS);
263-
}
264-
265-
PointerType *Type::getFloatPtrTy(LLVMContext &C, unsigned AS) {
266-
return getFloatTy(C)->getPointerTo(AS);
267-
}
268-
269-
PointerType *Type::getDoublePtrTy(LLVMContext &C, unsigned AS) {
270-
return getDoubleTy(C)->getPointerTo(AS);
271-
}
272-
273-
PointerType *Type::getX86_FP80PtrTy(LLVMContext &C, unsigned AS) {
274-
return getX86_FP80Ty(C)->getPointerTo(AS);
275-
}
276-
277-
PointerType *Type::getFP128PtrTy(LLVMContext &C, unsigned AS) {
278-
return getFP128Ty(C)->getPointerTo(AS);
279-
}
280-
281-
PointerType *Type::getPPC_FP128PtrTy(LLVMContext &C, unsigned AS) {
282-
return getPPC_FP128Ty(C)->getPointerTo(AS);
283-
}
284-
285-
PointerType *Type::getX86_MMXPtrTy(LLVMContext &C, unsigned AS) {
286-
return getX86_MMXTy(C)->getPointerTo(AS);
287-
}
288-
289-
PointerType *Type::getX86_AMXPtrTy(LLVMContext &C, unsigned AS) {
290-
return getX86_AMXTy(C)->getPointerTo(AS);
291-
}
292-
293-
PointerType *Type::getIntNPtrTy(LLVMContext &C, unsigned N, unsigned AS) {
294-
return getIntNTy(C, N)->getPointerTo(AS);
295-
}
296-
297-
PointerType *Type::getInt1PtrTy(LLVMContext &C, unsigned AS) {
298-
return getInt1Ty(C)->getPointerTo(AS);
299-
}
300-
301257
PointerType *Type::getInt8PtrTy(LLVMContext &C, unsigned AS) {
302-
return getInt8Ty(C)->getPointerTo(AS);
303-
}
304-
305-
PointerType *Type::getInt16PtrTy(LLVMContext &C, unsigned AS) {
306-
return getInt16Ty(C)->getPointerTo(AS);
307-
}
308-
309-
PointerType *Type::getInt32PtrTy(LLVMContext &C, unsigned AS) {
310-
return getInt32Ty(C)->getPointerTo(AS);
311-
}
312-
313-
PointerType *Type::getInt64PtrTy(LLVMContext &C, unsigned AS) {
314-
return getInt64Ty(C)->getPointerTo(AS);
258+
return PointerType::get(C, AS);
315259
}
316260

317261
Type *Type::getWasm_ExternrefTy(LLVMContext &C) {

0 commit comments

Comments
 (0)