diff --git a/llvm/lib/Transforms/AggressiveInstCombine/TruncInstCombine.cpp b/llvm/lib/Transforms/AggressiveInstCombine/TruncInstCombine.cpp --- a/llvm/lib/Transforms/AggressiveInstCombine/TruncInstCombine.cpp +++ b/llvm/lib/Transforms/AggressiveInstCombine/TruncInstCombine.cpp @@ -289,11 +289,8 @@ /// version of \p Ty, otherwise return \p Ty. static Type *getReducedType(Value *V, Type *Ty) { assert(Ty && !Ty->isVectorTy() && "Expect Scalar Type"); - if (auto *VTy = dyn_cast(V->getType())) { - // FIXME: should this handle scalable vectors? - return FixedVectorType::get(Ty, - cast(VTy)->getNumElements()); - } + if (auto *VTy = dyn_cast(V->getType())) + return VectorType::get(Ty, VTy->getElementCount()); return Ty; } diff --git a/llvm/test/Transforms/AggressiveInstCombine/trunc_const_expr.ll b/llvm/test/Transforms/AggressiveInstCombine/trunc_const_expr.ll --- a/llvm/test/Transforms/AggressiveInstCombine/trunc_const_expr.ll +++ b/llvm/test/Transforms/AggressiveInstCombine/trunc_const_expr.ll @@ -8,6 +8,7 @@ declare i32 @use32(i32) declare <2 x i32> @use32_vec(<2 x i32>) +declare @use32_scale_vec() ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; These tests check cases where expression dag post-dominated by TruncInst @@ -108,3 +109,35 @@ call <2 x i32> @use32_vec(<2 x i32> %T) ret void } + +define void @const_expression_mul_scale_vec() { +; CHECK-LABEL: @const_expression_mul_scale_vec( +; CHECK-NEXT: [[TMP1:%.*]] = call @use32_scale_vec( zeroinitializer) +; CHECK-NEXT: ret void +; + %A = mul zeroinitializer, zeroinitializer + %T = trunc %A to + call @use32_scale_vec( %T) + ret void +} + +define void @const_expression_zext_scale_vec() { +; CHECK-LABEL: @const_expression_zext_scale_vec( +; CHECK-NEXT: [[TMP1:%.*]] = call @use32_scale_vec( zeroinitializer) +; CHECK-NEXT: ret void +; + %A = zext zeroinitializer to + %T = trunc %A to + call @use32_scale_vec( %T) + ret void +} + +define void @const_expression_trunc_scale_vec() { +; CHECK-LABEL: @const_expression_trunc_scale_vec( +; CHECK-NEXT: [[TMP1:%.*]] = call @use32_scale_vec( zeroinitializer) +; CHECK-NEXT: ret void +; + %T = trunc zeroinitializer to + call @use32_scale_vec( %T) + ret void +}