From a7ff6d36af47bd427ebc2e6f0501ff81c509f9b7 Mon Sep 17 00:00:00 2001 From: Sanjoy Das Date: Wed, 26 Apr 2017 16:21:02 +0000 Subject: [PATCH] Use WeakVH instead of WeakTrackingVH in AliasSetTracker's UnkownInsts Summary: In cases where an instruction (a call site, say) is RAUW'ed with some other value (this is possible via the `returned` attribute, amongst other things), we want the slot in UnknownInsts to point to the original Instruction we wanted to track, not the value it got replaced by. Fixes PR32587. Reviewers: davide Subscribers: mcrosier, llvm-commits Differential Revision: https://reviews.llvm.org/D32268 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301426 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Analysis/AliasSetTracker.h | 4 +-- .../AliasSet/unknown-inst-tracking.ll | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 test/Analysis/AliasSet/unknown-inst-tracking.ll diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h index d150f8910d0..eac97501c75 100644 --- a/include/llvm/Analysis/AliasSetTracker.h +++ b/include/llvm/Analysis/AliasSetTracker.h @@ -121,10 +121,10 @@ class AliasSet : public ilist_node { AliasSet *Forward; /// All instructions without a specific address in this alias set. - /// In rare cases this vector can have a null'ed out WeakTrackingVH + /// In rare cases this vector can have a null'ed out WeakVH /// instances (can happen if some other loop pass deletes an /// instruction in this list). - std::vector UnknownInsts; + std::vector UnknownInsts; /// Number of nodes pointing to this AliasSet plus the number of AliasSets /// forwarding to it. diff --git a/test/Analysis/AliasSet/unknown-inst-tracking.ll b/test/Analysis/AliasSet/unknown-inst-tracking.ll new file mode 100644 index 00000000000..da528fbae07 --- /dev/null +++ b/test/Analysis/AliasSet/unknown-inst-tracking.ll @@ -0,0 +1,25 @@ +; RUN: opt -S -licm -loop-unswitch < %s | FileCheck %s + +; This test checks for a crash. See PR32587. + +@global = external global i32 + +declare i32 @f_1(i8, i32 returned) + +define i32 @f_0() { +; CHECK-LABEL: @f_0( +bb: + br label %bb1 + +bb1: ; preds = %bb3, %bb + %tmp = load i32, i32* @global + %tmp2 = select i1 false, i16 1, i16 0 + br label %bb3 + +bb3: ; preds = %bb3, %bb1 + %tmp4 = phi i8 [ 0, %bb1 ], [ %tmp6, %bb3 ] + %tmp5 = icmp eq i16 %tmp2, 0 + %tmp6 = select i1 %tmp5, i8 %tmp4, i8 1 + %tmp7 = tail call i32 @f_1(i8 %tmp6, i32 1) + br i1 false, label %bb1, label %bb3 +} -- 2.50.1