diff --git a/lib/Target/VE/VEISelLowering.cpp b/lib/Target/VE/VEISelLowering.cpp
index f1ed22069bd..2f65ccd62f9 100644
--- a/lib/Target/VE/VEISelLowering.cpp
+++ b/lib/Target/VE/VEISelLowering.cpp
@@ -837,7 +837,7 @@ bool VETargetLowering::isFPImmLegal(const APFloat &Imm, EVT VT,
 /// alignment error (trap) on the target machine.
 bool VETargetLowering::allowsMisalignedMemoryAccesses(EVT VT,
                                                       unsigned AddrSpace,
-                                                      unsigned Align,
+                                                      Align A,
                                                       MachineMemOperand::Flags,
                                                       bool *Fast) const {
   if (Fast) {
diff --git a/lib/Target/VE/VEISelLowering.h b/lib/Target/VE/VEISelLowering.h
index a6e1bf39603..1191bb995ae 100644
--- a/lib/Target/VE/VEISelLowering.h
+++ b/lib/Target/VE/VEISelLowering.h
@@ -183,7 +183,7 @@ public:
                     bool ForCodeSize) const override;
   /// Returns true if the target allows unaligned memory accesses of the
   /// specified type.
-  bool allowsMisalignedMemoryAccesses(EVT VT, unsigned AS, unsigned Align,
+  bool allowsMisalignedMemoryAccesses(EVT VT, unsigned AS, Align A,
                                       MachineMemOperand::Flags Flags,
                                       bool *Fast) const override;