Skip to content

Commit

Permalink
[InstCombine] Support vectors in simplifyIntToPtrRoundTripCast.
Browse files Browse the repository at this point in the history
This code compares getPointerTypeSizeInBits and getTypeSizeInBits.
getPointerTypeSizeInBits contains a call to getScalarType while
getTypeSizeInBits does not. This makes the code incorrect for vectors.

For scalable vectors this caused a warning about a scalable TypeSize
being converted to unsigned.

Switch to DL.getTypeSizeInBits for the pointers too. This should
work since inttoptr/ptrtoint can't change the number of elements.
This was suggested by @nikic in D139911.

Fixes PR59480.

Reviewed By: nikic

Differential Revision: https://reviews.llvm.org/D139962
  • Loading branch information
topperc committed Dec 13, 2022
1 parent adfb23c commit d08e3ae
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
4 changes: 2 additions & 2 deletions llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
Expand Up @@ -370,14 +370,14 @@ static bool simplifyAssocCastAssoc(BinaryOperator *BinOp1,
// inttoptr ( ptrtoint (x) ) --> x
Value *InstCombinerImpl::simplifyIntToPtrRoundTripCast(Value *Val) {
auto *IntToPtr = dyn_cast<IntToPtrInst>(Val);
if (IntToPtr && DL.getPointerTypeSizeInBits(IntToPtr->getDestTy()) ==
if (IntToPtr && DL.getTypeSizeInBits(IntToPtr->getDestTy()) ==
DL.getTypeSizeInBits(IntToPtr->getSrcTy())) {
auto *PtrToInt = dyn_cast<PtrToIntInst>(IntToPtr->getOperand(0));
Type *CastTy = IntToPtr->getDestTy();
if (PtrToInt &&
CastTy->getPointerAddressSpace() ==
PtrToInt->getSrcTy()->getPointerAddressSpace() &&
DL.getPointerTypeSizeInBits(PtrToInt->getSrcTy()) ==
DL.getTypeSizeInBits(PtrToInt->getSrcTy()) ==
DL.getTypeSizeInBits(PtrToInt->getDestTy())) {
return CastInst::CreateBitOrPointerCast(PtrToInt->getOperand(0), CastTy,
"", PtrToInt);
Expand Down
22 changes: 22 additions & 0 deletions llvm/test/Transforms/InstCombine/ptr-int-ptr-icmp.ll
Expand Up @@ -17,6 +17,28 @@ define i1 @func(ptr %X, ptr %Y) {
ret i1 %cmp
}

define <2 x i1> @func_vec(<2 x ptr> %X, <2 x ptr> %Y) {
; CHECK-LABEL: @func_vec(
; CHECK-NEXT: [[CMP:%.*]] = icmp eq <2 x ptr> [[X:%.*]], [[Y:%.*]]
; CHECK-NEXT: ret <2 x i1> [[CMP]]
;
%i = ptrtoint <2 x ptr> %X to <2 x i64>
%p = inttoptr <2 x i64> %i to <2 x ptr>
%cmp = icmp eq <2 x ptr> %p, %Y
ret <2 x i1> %cmp
}

define <vscale x 2 x i1> @func_svec(<vscale x 2 x ptr> %X, <vscale x 2 x ptr> %Y) {
; CHECK-LABEL: @func_svec(
; CHECK-NEXT: [[CMP:%.*]] = icmp eq <vscale x 2 x ptr> [[X:%.*]], [[Y:%.*]]
; CHECK-NEXT: ret <vscale x 2 x i1> [[CMP]]
;
%i = ptrtoint <vscale x 2 x ptr> %X to <vscale x 2 x i64>
%p = inttoptr <vscale x 2 x i64> %i to <vscale x 2 x ptr>
%cmp = icmp eq <vscale x 2 x ptr> %p, %Y
ret <vscale x 2 x i1> %cmp
}

define i1 @func_pointer_different_types(ptr %X, ptr %Y) {
; CHECK-LABEL: @func_pointer_different_types(
; CHECK-NEXT: [[CMP:%.*]] = icmp eq ptr [[X:%.*]], [[Y:%.*]]
Expand Down

0 comments on commit d08e3ae

Please sign in to comment.