From 9585c546b9a209ff25c73f4be50c51cfd4c29b70 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Sun, 9 Aug 2015 15:43:02 +0000 Subject: [PATCH] [PHITransAddr] Don't assume that instruction operands are translatable We can only PHI translate instructions. In our attempt to PHI translate a bitcast, we attempt to translate its operand; however, the operand might be an argument or a global instead of an instruction. Benignly bail out when this happens. This fixes PR24397. Differential Revision: http://reviews.llvm.org/D11879 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244418 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/PHITransAddr.cpp | 7 ++++--- test/Transforms/GVN/pr24397.ll | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 test/Transforms/GVN/pr24397.ll diff --git a/lib/Analysis/PHITransAddr.cpp b/lib/Analysis/PHITransAddr.cpp index 8d80c6028ba..f7545ea05a3 100644 --- a/lib/Analysis/PHITransAddr.cpp +++ b/lib/Analysis/PHITransAddr.cpp @@ -374,9 +374,10 @@ InsertPHITranslatedSubExpr(Value *InVal, BasicBlock *CurBB, if (!Tmp.PHITranslateValue(CurBB, PredBB, &DT, /*MustDominate=*/true)) return Tmp.getAddr(); - // If we don't have an available version of this value, it must be an - // instruction. - Instruction *Inst = cast(InVal); + // We don't need to PHI translate values which aren't instructions. + auto *Inst = dyn_cast(InVal); + if (!Inst) + return nullptr; // Handle cast of PHI translatable value. if (CastInst *Cast = dyn_cast(Inst)) { diff --git a/test/Transforms/GVN/pr24397.ll b/test/Transforms/GVN/pr24397.ll new file mode 100644 index 00000000000..db43964e2e4 --- /dev/null +++ b/test/Transforms/GVN/pr24397.ll @@ -0,0 +1,18 @@ +; RUN: opt -basicaa -gvn -disable-output < %s + +target triple = "x86_64-unknown-linux-gnu" + +define i64 @foo(i64** %arrayidx) { +entry: + %p = load i64*, i64** %arrayidx, align 8 + %cmpnull = icmp eq i64* %p, null + br label %BB2 + +entry2: ; No predecessors! + br label %BB2 + +BB2: ; preds = %entry2, %entry + %bc = bitcast i64** %arrayidx to i64* + %load = load i64, i64* %bc, align 8 + ret i64 %load +} -- 2.34.1