From 5e83e81ab2aa47894843fed66edfd08e1d8e15af Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Thu, 21 Aug 2014 23:36:08 +0000 Subject: [PATCH] Revert "X86: Align the stack on word boundaries in LowerFormalArguments()" This (mostly) reverts commit r216119. Somewhere during the review Reid committed r214980 which fixed this another way, and I neglected to check that the testcase still failed before committing. I've left test/CodeGen/X86/aligned-variadic.ll around in case it adds extra coverage. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216246 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/CallingConvLower.h | 9 ++------- lib/Target/X86/X86ISelLowering.cpp | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/llvm/CodeGen/CallingConvLower.h b/include/llvm/CodeGen/CallingConvLower.h index ffedd2e1410..3446486f873 100644 --- a/include/llvm/CodeGen/CallingConvLower.h +++ b/include/llvm/CodeGen/CallingConvLower.h @@ -371,16 +371,11 @@ public: return Reg; } - /// AlignStack - Align the top of the stakc to the specified alignment. - void AlignStack(unsigned Align) { - assert(Align && ((Align - 1) & Align) == 0); // Align is power of 2. - StackOffset = ((StackOffset + Align - 1) & ~(Align - 1)); - } - /// AllocateStack - Allocate a chunk of stack space with the specified size /// and alignment. unsigned AllocateStack(unsigned Size, unsigned Align) { - AlignStack(Align); + assert(Align && ((Align - 1) & Align) == 0); // Align is power of 2. + StackOffset = ((StackOffset + Align - 1) & ~(Align - 1)); unsigned Result = StackOffset; StackOffset += Size; MF.getFrameInfo()->ensureMaxAlignment(Align); diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 00d1e5cd270..afcabdcda7e 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -2298,7 +2298,6 @@ X86TargetLowering::LowerFormalArguments(SDValue Chain, CCInfo.AllocateStack(32, 8); CCInfo.AnalyzeFormalArguments(Ins, CC_X86); - CCInfo.AlignStack(Is64Bit ? 8 : 4); unsigned LastVal = ~0U; SDValue ArgValue;