diff --git a/include/llvm/CodeGen/BasicTTIImpl.h b/include/llvm/CodeGen/BasicTTIImpl.h
index 4962c0d5f89..497f6f7da81 100644
--- a/include/llvm/CodeGen/BasicTTIImpl.h
+++ b/include/llvm/CodeGen/BasicTTIImpl.h
@@ -1387,12 +1387,18 @@ public:
     case Intrinsic::lifetime_end:
     case Intrinsic::sideeffect:
       return 0;
-    case Intrinsic::masked_store:
-      return ConcreteTTI->getMaskedMemoryOpCost(Instruction::Store, Tys[0], 0,
+    case Intrinsic::masked_store: {
+      Type *Ty = Tys[0];
+      unsigned TyAlign = ConcreteTTI->DL.getABITypeAlignment(Ty);
+      return ConcreteTTI->getMaskedMemoryOpCost(Instruction::Store, Ty, TyAlign,
                                                 0, CostKind);
-    case Intrinsic::masked_load:
-      return ConcreteTTI->getMaskedMemoryOpCost(Instruction::Load, RetTy, 0, 0,
-                                                CostKind);
+    }
+    case Intrinsic::masked_load: {
+      Type *Ty = RetTy;
+      unsigned TyAlign = ConcreteTTI->DL.getABITypeAlignment(Ty);
+      return ConcreteTTI->getMaskedMemoryOpCost(Instruction::Load, Ty, TyAlign,
+                                                0, CostKind);
+    }
     case Intrinsic::experimental_vector_reduce_add:
       return ConcreteTTI->getArithmeticReductionCost(Instruction::Add, VecOpTy,
                                                      /*IsPairwiseForm=*/false,