Skip to content

Commit

Permalink
[SelectionDAG] Resolve PR33978.
Browse files Browse the repository at this point in the history
rL306209 taught SelectionDAG how to add the dereferenceable flag when
expanding memcpy and memmove. The fix however contained a nit where
the offset + size was constructed as an APInt of PointerSize rather
than PointerSizeInBits.

This lead to isDereferenceableAndAlignedPointer() get truncated values or
values which would be sign extended within that function leading to
incorrect results.

Thanks to Alex Crichton for reporting the issue!

This resolves PR33978.

Reviewers: inouehrs

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

llvm-svn: 309930
  • Loading branch information
Simon Dardis committed Aug 3, 2017
1 parent cd50b5c commit 5129659
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
6 changes: 2 additions & 4 deletions llvm/lib/CodeGen/MachineInstr.cpp
Expand Up @@ -581,10 +581,8 @@ bool MachinePointerInfo::isDereferenceable(unsigned Size, LLVMContext &C,
if (BasePtr == nullptr)
return false;

return isDereferenceableAndAlignedPointer(BasePtr, 1,
APInt(DL.getPointerSize(),
Offset + Size),
DL);
return isDereferenceableAndAlignedPointer(
BasePtr, 1, APInt(DL.getPointerSizeInBits(), Offset + Size), DL);
}

/// getConstantPool - Return a MachinePointerInfo record that refers to the
Expand Down
20 changes: 20 additions & 0 deletions llvm/test/CodeGen/Mips/pr33978.ll
@@ -0,0 +1,20 @@
; RUN: llc -march=mips -mcpu=mips32r2 < %s -o /dev/null

; Test that SelectionDAG does not crash during DAGCombine when two pointers
; to the stack match with differing bases and offsets when expanding memcpy.
; This could result in one of the pointers being considered dereferenceable
; and other not.

define void @foo(i8*) {
start:
%a = alloca [22 x i8]
%b = alloca [22 x i8]
%c = bitcast [22 x i8]* %a to i8*
%d = getelementptr inbounds [22 x i8], [22 x i8]* %b, i32 0, i32 2
call void @llvm.memcpy.p0i8.p0i8.i32(i8* %c, i8* %d, i32 20, i32 1, i1 false)
%e = getelementptr inbounds [22 x i8], [22 x i8]* %b, i32 0, i32 6
call void @llvm.memcpy.p0i8.p0i8.i32(i8* %0, i8* %e, i32 12, i32 1, i1 false)
ret void
}

declare void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i32, i1)

0 comments on commit 5129659

Please sign in to comment.