aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2013-02-18 21:45:01 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2013-02-18 21:45:01 +0000
commit6228999d826c87ac90344356c2d123361dc1d648 (patch)
tree5f951fc2a9a84e38b9a2d9be4bf6a61803bd96e3
parent98fbe27ac8f0766ea94b89b8c03418131b72bea4 (diff)
downloadexternal_llvm-6228999d826c87ac90344356c2d123361dc1d648.zip
external_llvm-6228999d826c87ac90344356c2d123361dc1d648.tar.gz
external_llvm-6228999d826c87ac90344356c2d123361dc1d648.tar.bz2
Fix a 32/64 bit incompatibility in the HiPE prologue generation.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175458 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86FrameLowering.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
index eb9f865..038c395 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);
}