diff options
author | Bill Wendling <isanbard@gmail.com> | 2010-05-14 21:28:24 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2010-05-14 21:28:24 +0000 |
commit | db4bc54c4f43b5c055ef8002496216a992d51904 (patch) | |
tree | 199154c7c2aade0a8cfbde0771ed21862a574d30 | |
parent | 866b74ba8b11ad174b2d9e2753c539ef21b3d57a (diff) | |
download | bcm5719-llvm-db4bc54c4f43b5c055ef8002496216a992d51904.tar.gz bcm5719-llvm-db4bc54c4f43b5c055ef8002496216a992d51904.zip |
Revert r103804. The comment is correct.
llvm-svn: 103808
-rw-r--r-- | llvm/lib/Target/TargetMachine.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/Target/X86/X86RegisterInfo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp index 54650a059f8..ac67c91f170 100644 --- a/llvm/lib/Target/TargetMachine.cpp +++ b/llvm/lib/Target/TargetMachine.cpp @@ -277,7 +277,7 @@ namespace llvm { return true; if (NoFramePointerElimNonLeaf) { const MachineFrameInfo *MFI = MF.getFrameInfo(); - return MFI->adjustsStack(); + return MFI->hasCalls(); } return false; } diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 1397dbdb4f5..2db3c703cc9 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -898,7 +898,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { if (Is64Bit && !Fn->hasFnAttr(Attribute::NoRedZone) && !needsStackRealignment(MF) && !MFI->hasVarSizedObjects() && // No dynamic alloca. - !MFI->adjustsStack() && // Doesn't adjust stack. + !MFI->adjustsStack() && // No calls. !Subtarget->isTargetWin64()) { // Win64 has no Red Zone uint64_t MinSize = X86FI->getCalleeSavedFrameSize(); if (HasFP) MinSize += SlotSize; |