Skip to content

Commit 859338a

Browse files
committed
[llvm] Replace uses of Type::getPointerTo (NFC)
Work towards removing method Type::getPointerTo. Opaque ptr cleanup effort.
1 parent 3bf72bf commit 859338a

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

llvm/lib/CodeGen/SafeStack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ bool SafeStack::run() {
793793
DILocation::get(SP->getContext(), SP->getScopeLine(), 0, SP));
794794
if (SafeStackUsePointerAddress) {
795795
FunctionCallee Fn = F.getParent()->getOrInsertFunction(
796-
"__safestack_pointer_address", StackPtrTy->getPointerTo(0));
796+
"__safestack_pointer_address", IRB.getPtrTy(0));
797797
UnsafeStackPtr = IRB.CreateCall(Fn);
798798
} else {
799799
UnsafeStackPtr = TL.getSafeStackPointerLocation(IRB);

llvm/lib/CodeGen/ShadowStackGCLowering.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ bool ShadowStackGCLowering::runOnFunction(Function &F) {
326326

327327
// Initialize the map pointer and load the current head of the shadow stack.
328328
Instruction *CurrentHead =
329-
AtEntry.CreateLoad(StackEntryTy->getPointerTo(), Head, "gc_currhead");
329+
AtEntry.CreateLoad(AtEntry.getPtrTy(), Head, "gc_currhead");
330330
Instruction *EntryMapPtr = CreateGEP(Context, AtEntry, ConcreteStackEntryTy,
331331
StackEntry, 0, 1, "gc_frame.map");
332332
AtEntry.CreateStore(FrameMap, EntryMapPtr);
@@ -368,8 +368,8 @@ bool ShadowStackGCLowering::runOnFunction(Function &F) {
368368
Instruction *EntryNextPtr2 =
369369
CreateGEP(Context, *AtExit, ConcreteStackEntryTy, StackEntry, 0, 0,
370370
"gc_frame.next");
371-
Value *SavedHead = AtExit->CreateLoad(StackEntryTy->getPointerTo(),
372-
EntryNextPtr2, "gc_savedhead");
371+
Value *SavedHead =
372+
AtExit->CreateLoad(AtExit->getPtrTy(), EntryNextPtr2, "gc_savedhead");
373373
AtExit->CreateStore(SavedHead, Head);
374374
}
375375

llvm/lib/Transforms/Coroutines/CoroInternal.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ struct LLVM_LIBRARY_VISIBILITY Shape {
185185
switch (ABI) {
186186
case coro::ABI::Switch:
187187
return FunctionType::get(Type::getVoidTy(FrameTy->getContext()),
188-
FrameTy->getPointerTo(), /*IsVarArg*/false);
188+
PointerType::getUnqual(FrameTy->getContext()),
189+
/*IsVarArg=*/false);
189190
case coro::ABI::Retcon:
190191
case coro::ABI::RetconOnce:
191192
return RetconLowering.ResumePrototype->getFunctionType();

llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,14 +1105,11 @@ Function *GCOVProfiler::insertCounterWriteout(
11051105
StructType *EmitFunctionCallArgsTy = StructType::create(
11061106
{Builder.getInt32Ty(), Builder.getInt32Ty(), Builder.getInt32Ty()},
11071107
"emit_function_args_ty");
1108-
StructType *EmitArcsCallArgsTy = StructType::create(
1109-
{Builder.getInt32Ty(), Builder.getInt64Ty()->getPointerTo()},
1110-
"emit_arcs_args_ty");
1111-
StructType *FileInfoTy =
1112-
StructType::create({StartFileCallArgsTy, Builder.getInt32Ty(),
1113-
EmitFunctionCallArgsTy->getPointerTo(),
1114-
EmitArcsCallArgsTy->getPointerTo()},
1115-
"file_info");
1108+
auto *PtrTy = Builder.getPtrTy();
1109+
StructType *EmitArcsCallArgsTy =
1110+
StructType::create({Builder.getInt32Ty(), PtrTy}, "emit_arcs_args_ty");
1111+
StructType *FileInfoTy = StructType::create(
1112+
{StartFileCallArgsTy, Builder.getInt32Ty(), PtrTy, PtrTy}, "file_info");
11161113

11171114
Constant *Zero32 = Builder.getInt32(0);
11181115
// Build an explicit array of two zeros for use in ConstantExpr GEP building.

llvm/lib/Transforms/Vectorize/VectorCombine.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ bool VectorCombine::vectorizeLoadInsert(Instruction &I) {
262262
// It is safe and potentially profitable to load a vector directly:
263263
// inselt undef, load Scalar, 0 --> load VecPtr
264264
IRBuilder<> Builder(Load);
265-
Value *CastedPtr = Builder.CreatePointerBitCastOrAddrSpaceCast(
266-
SrcPtr, MinVecTy->getPointerTo(AS));
265+
Value *CastedPtr =
266+
Builder.CreatePointerBitCastOrAddrSpaceCast(SrcPtr, Builder.getPtrTy(AS));
267267
Value *VecLd = Builder.CreateAlignedLoad(MinVecTy, CastedPtr, Alignment);
268268
VecLd = Builder.CreateShuffleVector(VecLd, Mask);
269269

@@ -325,7 +325,7 @@ bool VectorCombine::widenSubvectorLoad(Instruction &I) {
325325

326326
IRBuilder<> Builder(Load);
327327
Value *CastedPtr =
328-
Builder.CreatePointerBitCastOrAddrSpaceCast(SrcPtr, Ty->getPointerTo(AS));
328+
Builder.CreatePointerBitCastOrAddrSpaceCast(SrcPtr, Builder.getPtrTy(AS));
329329
Value *VecLd = Builder.CreateAlignedLoad(Ty, CastedPtr, Alignment);
330330
replaceValue(I, *VecLd);
331331
++NumVecLoad;

0 commit comments

Comments
 (0)