From 84e6f1dd704a15eeb6d4ca189af60d7b28c3f994 Mon Sep 17 00:00:00 2001 From: Lawrence Hu Date: Fri, 19 Feb 2016 02:17:07 +0000 Subject: [PATCH] Bug fix: use dyn_cast_or_null instead of dyn_cast Differential Revision: http://reviews.llvm.org/D17154 llvm-svn: 261299 --- .../Scalar/SeparateConstOffsetFromGEP.cpp | 4 ++-- llvm/test/CodeGen/AArch64/gep-nullptr.ll | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 llvm/test/CodeGen/AArch64/gep-nullptr.ll diff --git a/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp b/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp index bf32e10..f94aa9e 100644 --- a/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp +++ b/llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp @@ -824,8 +824,8 @@ void SeparateConstOffsetFromGEP::lowerToSingleIndexGEPs( // If we created a GEP with constant index, and the base is loop invariant, // then we swap the first one with it, so LICM can move constant GEP out // later. - GetElementPtrInst *FirstGEP = dyn_cast(FirstResult); - GetElementPtrInst *SecondGEP = dyn_cast(ResultPtr); + GetElementPtrInst *FirstGEP = dyn_cast_or_null(FirstResult); + GetElementPtrInst *SecondGEP = dyn_cast_or_null(ResultPtr); if (isSwapCandidate && isLegalToSwapOperand(FirstGEP, SecondGEP, L)) swapGEPOperand(FirstGEP, SecondGEP); diff --git a/llvm/test/CodeGen/AArch64/gep-nullptr.ll b/llvm/test/CodeGen/AArch64/gep-nullptr.ll new file mode 100644 index 0000000..4c2bc50 --- /dev/null +++ b/llvm/test/CodeGen/AArch64/gep-nullptr.ll @@ -0,0 +1,23 @@ +; RUN: llc -O3 -aarch64-gep-opt=true < %s |FileCheck %s +target datalayout = "e-m:e-i64:64-i128:128-n8:16:32:64-S128" +target triple = "aarch64--linux-gnu" + +%structA = type { i8, i8, i8, i8, i8, i8, [4 x i8], i8, i8, [2 x i32], [2 x %unionMV], [4 x [2 x %unionMV]], [4 x [2 x %unionMV]], [4 x i8], i8*, i8*, i32, i8* } +%unionMV = type { i32 } + +; Function Attrs: nounwind +define void @test(%structA* %mi_block) { +entry: + br i1 undef, label %for.body13.us, label %if.else + +; Just make sure we don't get a compiler ICE due to dereferncing a nullptr. +; CHECK-LABEL: test +for.body13.us: ; preds = %entry + %indvars.iv.next40 = or i64 0, 1 + %packed4.i.us.1 = getelementptr inbounds %structA, %structA* %mi_block, i64 0, i32 11, i64 0, i64 %indvars.iv.next40, i32 0 + unreachable + +if.else: ; preds = %entry + ret void +} + -- 2.7.4