Skip to content

Commit 5ac5c0e

Browse files
committed
[llvm][X86WinEHState] Replace calls to 'Type::getPointerTo' (NFC)
Work towards to the TODO item of removing method `Type::getPointerTo` (as noted in llvm/include/llvm/IR/Type.h).
1 parent 2ac6b26 commit 5ac5c0e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

llvm/lib/Target/X86/X86WinEHState.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@ void WinEHStatePass::linkExceptionRegistration(IRBuilder<> &Builder,
418418
// Emit the .safeseh directive for this function.
419419
Handler->addFnAttr("safeseh");
420420

421+
LLVMContext &C = Builder.getContext();
421422
Type *LinkTy = getEHLinkRegistrationType();
422423
// Handler = Handler
423424
Builder.CreateStore(Handler, Builder.CreateStructGEP(LinkTy, Link, 1));
424425
// Next = [fs:00]
425-
Constant *FSZero =
426-
Constant::getNullValue(LinkTy->getPointerTo()->getPointerTo(257));
427-
Value *Next = Builder.CreateLoad(LinkTy->getPointerTo(), FSZero);
426+
Constant *FSZero = Constant::getNullValue(PointerType::get(C, 257));
427+
Value *Next = Builder.CreateLoad(PointerType::getUnqual(C), FSZero);
428428
Builder.CreateStore(Next, Builder.CreateStructGEP(LinkTy, Link, 0));
429429
// [fs:00] = Link
430430
Builder.CreateStore(Link, FSZero);
@@ -437,12 +437,13 @@ void WinEHStatePass::unlinkExceptionRegistration(IRBuilder<> &Builder) {
437437
Builder.Insert(GEP);
438438
Link = GEP;
439439
}
440+
441+
LLVMContext &C = Builder.getContext();
440442
Type *LinkTy = getEHLinkRegistrationType();
441443
// [fs:00] = Link->Next
442-
Value *Next = Builder.CreateLoad(LinkTy->getPointerTo(),
444+
Value *Next = Builder.CreateLoad(PointerType::getUnqual(C),
443445
Builder.CreateStructGEP(LinkTy, Link, 0));
444-
Constant *FSZero =
445-
Constant::getNullValue(LinkTy->getPointerTo()->getPointerTo(257));
446+
Constant *FSZero = Constant::getNullValue(PointerType::get(C, 257));
446447
Builder.CreateStore(Next, FSZero);
447448
}
448449

0 commit comments

Comments
 (0)