Skip to content

Commit

Permalink
[SROA] Fix a crash when trying to convert a memset to an non-integral…
Browse files Browse the repository at this point in the history
… pointer type

The included test case currently crashes on tip of tree. Rather than adding a bailout, I chose to restructure the code so that the existing helper function could be used. Given that, the majority of the diff is NFC-ish, but the key difference is that canConvertValue returns false when only one side is a non-integral pointer.

Thanks to Cherry Zhang for the test case.

Differential Revision: https://reviews.llvm.org/D59000

llvm-svn: 355962
  • Loading branch information
preames committed Mar 12, 2019
1 parent a470a13 commit 9b6b4fa
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 6 deletions.
23 changes: 17 additions & 6 deletions llvm/lib/Transforms/Scalar/SROA.cpp
Expand Up @@ -2727,15 +2727,26 @@ class llvm::sroa::AllocaSliceRewriter

Type *AllocaTy = NewAI.getAllocatedType();
Type *ScalarTy = AllocaTy->getScalarType();

const bool CanContinue = [&]() {
if (VecTy || IntTy)
return true;
if (BeginOffset > NewAllocaBeginOffset ||
EndOffset < NewAllocaEndOffset)
return false;
auto *C = cast<ConstantInt>(II.getLength());
if (C->getBitWidth() > 64)
return false;
const auto Len = C->getZExtValue();
auto *Int8Ty = IntegerType::getInt8Ty(NewAI.getContext());
auto *SrcTy = VectorType::get(Int8Ty, Len);
return canConvertValue(DL, SrcTy, AllocaTy) &&
DL.isLegalInteger(DL.getTypeSizeInBits(ScalarTy));
}();

// If this doesn't map cleanly onto the alloca type, and that type isn't
// a single value type, just emit a memset.
if (!VecTy && !IntTy &&
(BeginOffset > NewAllocaBeginOffset || EndOffset < NewAllocaEndOffset ||
SliceSize != DL.getTypeStoreSize(AllocaTy) ||
!AllocaTy->isSingleValueType() ||
!DL.isLegalInteger(DL.getTypeSizeInBits(ScalarTy)) ||
DL.getTypeSizeInBits(ScalarTy) % 8 != 0)) {
if (!CanContinue) {
Type *SizeTy = II.getLength()->getType();
Constant *Size = ConstantInt::get(SizeTy, NewEndOffset - NewBeginOffset);
CallInst *New = IRB.CreateMemSet(
Expand Down
42 changes: 42 additions & 0 deletions llvm/test/Transforms/SROA/non-integral-pointers.ll
Expand Up @@ -44,3 +44,45 @@ neverTaken:
alwaysTaken:
ret i64 42
}

define i64 addrspace(4)* @memset(i1 %alwaysFalse) {
; CHECK-LABEL: @memset(
; CHECK-NOT: inttoptr
; CHECK-NOT: ptrtoint
entry:
%x = alloca i64 addrspace(4)*
%cast.0 = bitcast i64 addrspace(4)** %x to i8*
call void @llvm.memset.p0i8.i64(i8* align 8 %cast.0, i8 5, i64 16, i1 false)
br i1 %alwaysFalse, label %neverTaken, label %alwaysTaken

neverTaken:
%x.field.ld.0 = load i64 addrspace(4)*, i64 addrspace(4)** %x
ret i64 addrspace(4)* %x.field.ld.0

alwaysTaken:
ret i64 addrspace(4)* null
}

;; TODO: This one demonstrates a missed oppurtunity. The only known bit
;; pattern for a non-integral bit pattern is that null is zero. As such
;; we could do SROA and replace the memset w/a null store. This will
;; usually be gotten by instcombine.
define i64 addrspace(4)* @memset_null(i1 %alwaysFalse) {
; CHECK-LABEL: @memset_null(
; CHECK-NOT: inttoptr
; CHECK-NOT: ptrtoint
entry:
%x = alloca i64 addrspace(4)*
%cast.0 = bitcast i64 addrspace(4)** %x to i8*
call void @llvm.memset.p0i8.i64(i8* align 8 %cast.0, i8 0, i64 16, i1 false)
br i1 %alwaysFalse, label %neverTaken, label %alwaysTaken

neverTaken:
%x.field.ld.0 = load i64 addrspace(4)*, i64 addrspace(4)** %x
ret i64 addrspace(4)* %x.field.ld.0

alwaysTaken:
ret i64 addrspace(4)* null
}

declare void @llvm.memset.p0i8.i64(i8*, i8, i64, i1)

0 comments on commit 9b6b4fa

Please sign in to comment.