diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
index eb9f865085b..038c39532f8 100644
--- a/lib/Target/X86/X86FrameLowering.cpp
+++ b/lib/Target/X86/X86FrameLowering.cpp
@@ -1682,7 +1682,7 @@ void X86FrameLowering::adjustForHiPEPrologue(MachineFunction &MF) const {
             continue;
 
           const uint64_t CalleeStkArity =
-            std::max<int64_t>(0, F->arg_size() - CCRegisteredArgs);
+            std::max<ssize_t>(0, F->arg_size() - CCRegisteredArgs);
           MoreStackForCalls = std::max<int64_t>(
             MoreStackForCalls, (HipeLeafWords - 1 - CalleeStkArity) * SlotSize);
         }