Temporary disable the error - it seems to be too conservative.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@88800 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 44f1fa3b03583fc5928e27d9a43133d16499ceec..f577fcf13e05143e6cffe9c253c5248100455184 100644 (file)
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -459,12 +459,13 @@ bool X86RegisterInfo::needsStackRealignment(const MachineFunction &MF) const {
     RealignStack && (MFI->getMaxAlignment() > StackAlign);
 
   // FIXME: Currently we don't support stack realignment for functions with
-  //        variable-sized allocas
-  if (requiresRealignment && MFI->hasVarSizedObjects())
+  //        variable-sized allocas.
+  // FIXME: Temporary disable the error - it seems to be too conservative.
+  if (0 && requiresRealignment && MFI->hasVarSizedObjects())
     llvm_report_error(
       "Stack realignment in presense of dynamic allocas is not supported");
 
-  return requiresRealignment;
+  return (requiresRealignment && !MFI->hasVarSizedObjects());
 }
 
 bool X86RegisterInfo::hasReservedCallFrame(MachineFunction &MF) const {