shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[ValueTracking] Fix endless recursion in isKnownNonZero()

Browse Source 
Summary:
The isKnownNonZero() function have checks that abort the recursion when
it reaches the specified max depth. However one of the recursive calls
was placed before the max depth check was done, resulting in a endless
recursion that eventually triggered a segmentation fault.

Fixed the problem by moving the max depth check above the first
recursive call.

Reviewers: Prazek, nlopes, spatel, craig.topper, hfinkel

Reviewed By: hfinkel

Subscribers: hfinkel, bjope, llvm-commits

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

llvm-svn: 333557
This commit is contained in:
Karl-Johan Karlsson 2018-05-30 15:56:46 +00:00
parent 1054541490
commit ebaaa2ddae
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Analysis/ValueTracking.cpp
View File

@ -1943,6 +1943,10 @@ bool isKnownNonZero(const Value *V, unsigned Depth, const Query &Q) {
}
}
// Some of the tests below are recursive, so bail out if we hit the limit.
if (Depth++ >= MaxDepth)
return false;
// Check for pointer simplifications.
if (V->getType()->isPointerTy()) {
// Alloca never returns null, malloc might.
@ -1963,13 +1967,10 @@ bool isKnownNonZero(const Value *V, unsigned Depth, const Query &Q) {
if (CS.isReturnNonNull())
return true;
if (const auto *RP = getArgumentAliasingToReturnedPointer(CS))
return isKnownNonZero(RP, Depth + 1, Q);
return isKnownNonZero(RP, Depth, Q);
}
}
// The remaining tests are all recursive, so bail out if we hit the limit.
if (Depth++ >= MaxDepth)
return false;
// Check for recursive pointer simplifications.
if (V->getType()->isPointerTy()) {

35
llvm/test/Transforms/CorrelatedValuePropagation/pointer.ll Normal file
View File

@ -0,0 +1,35 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -correlated-propagation -S -o - %s | FileCheck %s
; Testcase that checks that we don't end in a neverending recursion resulting in
; a segmentation fault. The checks below verify that nothing is changed.
declare dso_local i16* @f2(i16* readnone returned) local_unnamed_addr
define dso_local void @f3() local_unnamed_addr {
; CHECK-LABEL: @f3(
; CHECK-NEXT: entry:
; CHECK-NEXT: br label [[FOR_COND:%.*]]
; CHECK: for.end:
; CHECK-NEXT: [[CALL6:%.*]] = call i16* @f2(i16* [[CALL6]])
; CHECK-NEXT: br i1 false, label [[FOR_COND]], label [[FOR_COND3:%.*]]
; CHECK: for.cond:
; CHECK-NEXT: [[C_0:%.*]] = phi i16* [ undef, [[ENTRY:%.*]] ], [ [[CALL6]], [[FOR_END:%.*]] ]
; CHECK-NEXT: br label [[FOR_COND3]]
; CHECK: for.cond3:
; CHECK-NEXT: ret void
;
entry:
br label %for.cond
for.end:
%call6 = call i16* @f2(i16* %call6)
br i1 false, label %for.cond, label %for.cond3
for.cond:
%c.0 = phi i16* [ undef, %entry ], [ %call6, %for.end ]
br label %for.cond3
for.cond3:
ret void
}