diff options
| -rw-r--r-- | llvm/lib/Target/X86/X86RegisterInfo.cpp | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 44f1fa3b035..f577fcf13e0 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/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 {  | 

