Skip to content

Commit

Permalink
Fix an infinite loop in InstCombine when an instruction with no users…
Browse files Browse the repository at this point in the history
… and side effects can be constant folded.

ReplaceInstUsesWith needs to return nullptr when the input has no users,
because in that case it does not mutate the program.  Otherwise, we can
get stuck in an infinite loop of repeatedly attempting to constant fold
and instruction with no users.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231755 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
resistor committed Mar 10, 2015
1 parent cf08570 commit 645fd68
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/Transforms/InstCombine/InstCombineInternal.h
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ class LLVM_LIBRARY_VISIBILITY InstCombiner
/// I to the worklist, replace all uses of I with the new value, then return
/// I, so that the inst combiner will know that I was modified.
Instruction *ReplaceInstUsesWith(Instruction &I, Value *V) {
// If there are no uses to replace, then we return nullptr to indicate that
// no changes were made to the program.
if (I.use_empty()) return nullptr;

Worklist.AddUsersToWorkList(I); // Add all modified instrs to worklist.

// If we are replacing the instruction with itself, this must be in a
Expand Down
14 changes: 14 additions & 0 deletions test/Transforms/InstCombine/constant-fold-hang.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
; RUN: opt -instcombine < %s

; Function Attrs: nounwind readnone ssp
define void @mulByZero(<4 x i16> %x) #0 {
entry:
%a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> %x, <4 x i16> zeroinitializer) #2
ret void
}

; Function Attrs: nounwind readnone
declare <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16>, <4 x i16>) #1

attributes #0 = { nounwind readnone ssp }
attributes #1 = { nounwind readnone }

0 comments on commit 645fd68

Please sign in to comment.