diff options
| author | Dale Johannesen <dalej@apple.com> | 2008-04-01 20:00:57 +0000 |
|---|---|---|
| committer | Dale Johannesen <dalej@apple.com> | 2008-04-01 20:00:57 +0000 |
| commit | b6d5b1439047609c050576f3dc52b722e76bd30b (patch) | |
| tree | 40d27805f206bbe0dbb4b11ec963fa0a4a026cdf /lib/Target/X86/X86RegisterInfo.cpp | |
| parent | 5a15814098702ea301e2f7ef045b12126c808eaf (diff) | |
| download | llvm-b6d5b1439047609c050576f3dc52b722e76bd30b.tar.gz llvm-b6d5b1439047609c050576f3dc52b722e76bd30b.tar.bz2 llvm-b6d5b1439047609c050576f3dc52b722e76bd30b.tar.xz | |
Revert 49006 for the moment.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49046 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86RegisterInfo.cpp')
| -rw-r--r-- | lib/Target/X86/X86RegisterInfo.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index 95026f281a..5cd2fbe35e 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -504,8 +504,6 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { MachineModuleInfo *MMI = MFI->getMachineModuleInfo(); X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>(); MachineBasicBlock::iterator MBBI = MBB.begin(); - bool needsFrameInfo = (MMI && MMI->hasDebugInfo()) || - ExceptionHandling || !Fn->doesNotThrow(); // Prepare for frame info. unsigned FrameLabelId = 0; @@ -538,7 +536,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { .addReg(FramePtr); NumBytes -= SlotSize; - if (needsFrameInfo) { + if (MMI && MMI->needsFrameInfo()) { // Mark effective beginning of when frame pointer becomes valid. FrameLabelId = MMI->NextLabelID(); BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(FrameLabelId).addImm(0); @@ -550,7 +548,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { } unsigned ReadyLabelId = 0; - if (needsFrameInfo) { + if (MMI && MMI->needsFrameInfo()) { // Mark effective beginning of when frame pointer is ready. ReadyLabelId = MMI->NextLabelID(); BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(ReadyLabelId).addImm(0); @@ -609,7 +607,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const { } } - if (needsFrameInfo) { + if (MMI && MMI->needsFrameInfo()) { std::vector<MachineMove> &Moves = MMI->getFrameMoves(); const TargetData *TD = MF.getTarget().getTargetData(); |