diff --git a/llvm/lib/Analysis/InstructionSimplify.cpp b/llvm/lib/Analysis/InstructionSimplify.cpp --- a/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/llvm/lib/Analysis/InstructionSimplify.cpp @@ -4081,13 +4081,16 @@ if (isa(Ops[0])) return UndefValue::get(GEPTy); + bool IsScalableVec = + SrcTy->isVectorTy() ? SrcTy->getVectorIsScalable() : false; + if (Ops.size() == 2) { // getelementptr P, 0 -> P. if (match(Ops[1], m_Zero()) && Ops[0]->getType() == GEPTy) return Ops[0]; Type *Ty = SrcTy; - if (Ty->isSized()) { + if (!IsScalableVec && Ty->isSized()) { Value *P; uint64_t C; uint64_t TyAllocSize = Q.DL.getTypeAllocSize(Ty); @@ -4135,7 +4138,7 @@ } } - if (Q.DL.getTypeAllocSize(LastType) == 1 && + if (!IsScalableVec && Q.DL.getTypeAllocSize(LastType) == 1 && all_of(Ops.slice(1).drop_back(1), [](Value *Idx) { return match(Idx, m_Zero()); })) { unsigned IdxWidth = diff --git a/llvm/test/Transforms/InstSimplify/vscale.ll b/llvm/test/Transforms/InstSimplify/vscale.ll --- a/llvm/test/Transforms/InstSimplify/vscale.ll +++ b/llvm/test/Transforms/InstSimplify/vscale.ll @@ -94,3 +94,42 @@ ret i32 %r } +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Memory Access and Addressing Operations +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; getelementptr + +define @getelementptr_constant_foldable_1() { +; CHECK-LABEL: @getelementptr_constant_foldable_1( +; CHECK-NEXT: ret zeroinitializer +; + %ptr = getelementptr i32, zeroinitializer, undef + ret %ptr +} + +define *> @getelementptr_constant_foldable_2() { +; CHECK-LABEL: @getelementptr_constant_foldable_2( +; CHECK-NEXT: ret *> zeroinitializer +; + %ptr = getelementptr , * null, undef + ret *> %ptr +} + +; fold getelementptr P, 0 -> P. +define * @getelementptr_constant_foldable_3() { +; CHECK-LABEL: @getelementptr_constant_foldable_3( +; CHECK-NEXT: ret * null +; + %ptr = getelementptr , * null, i64 0 + ret * %ptr +} + +define * @getelementptr_not_constant_foldable(i64 %x) { +; CHECK-LABEL: @getelementptr_not_constant_foldable( +; CHECK-NEXT: [[PTR:%.*]] = getelementptr , * null, i64 [[X:%.*]] +; CHECK-NEXT: ret * [[PTR]] +; + %ptr = getelementptr , * null, i64 %x + ret * %ptr +}