Cosmetic changes per EH patch review feedback.

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

diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 0fa956e0972dc073ea07897cc52b4b1c8ac35c37..010dfa0a793b34b9c6d3de6a14a951a25fe4a074 100644 (file)
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -3415,7 +3415,7 @@ public:
   void BeginFunction(MachineFunction *MF) {
     this->MF = MF;
     shouldEmitTable = shouldEmitMoves = false;
-    if (TAI->doesSupportExceptionHandling()) {
+    if (MMI && TAI->doesSupportExceptionHandling()) {
 
       // Map all labels and get rid of any dead landing pads.
       MMI->TidyLandingPads();

diff --git a/lib/Target/PowerPC/PPCRegisterInfo.cpp b/lib/Target/PowerPC/PPCRegisterInfo.cpp
index 3bafccde8de69e6a5bd9befbbb61845955cf47a2..8ef8b3fafa67588fca660a7fc44d4ca3da5b6199 100644 (file)
--- a/lib/Target/PowerPC/PPCRegisterInfo.cpp
+++ b/lib/Target/PowerPC/PPCRegisterInfo.cpp
@@ -947,7 +947,7 @@ PPCRegisterInfo::emitPrologue(MachineFunction &MF) const {
   MachineBasicBlock::iterator MBBI = MBB.begin();
   MachineFrameInfo *MFI = MF.getFrameInfo();
   MachineModuleInfo *MMI = MFI->getMachineModuleInfo();
-  bool needsFrameInfo = (MMI && MMI->hasDebugInfo()) ||
+  bool needsFrameMoves = (MMI && MMI->hasDebugInfo()) ||
        !MF.getFunction()->doesNotThrow();
   
   // Prepare for frame info.
@@ -1022,7 +1022,7 @@ PPCRegisterInfo::emitPrologue(MachineFunction &MF) const {
   unsigned TargetAlign = MF.getTarget().getFrameInfo()->getStackAlignment();
   unsigned MaxAlign = MFI->getMaxAlignment();
 
-  if (needsFrameInfo) {
+  if (needsFrameMoves) {
     // Mark effective beginning of when frame pointer becomes valid.
     FrameLabelId = MMI->NextLabelID();
     BuildMI(MBB, MBBI, TII.get(PPC::LABEL)).addImm(FrameLabelId).addImm(0);
@@ -1098,7 +1098,7 @@ PPCRegisterInfo::emitPrologue(MachineFunction &MF) const {
     }
   }
   
-  if (needsFrameInfo) {
+  if (needsFrameMoves) {
     std::vector<MachineMove> &Moves = MMI->getFrameMoves();
     
     if (NegFrameSize) {

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 6c3484ecfffab1dfb632b5a0064b049b8076c4ee..0a755605d49ac05d6c2ceb85ecaea91224432e11 100644 (file)
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -504,7 +504,7 @@ 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()) || !Fn->doesNotThrow();
+  bool needsFrameMoves = (MMI && MMI->hasDebugInfo()) || !Fn->doesNotThrow();
   
   // Prepare for frame info.
   unsigned FrameLabelId = 0;
@@ -537,7 +537,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const {
       .addReg(FramePtr);
     NumBytes -= SlotSize;
 
-    if (needsFrameInfo) {
+    if (needsFrameMoves) {
       // Mark effective beginning of when frame pointer becomes valid.
       FrameLabelId = MMI->NextLabelID();
       BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(FrameLabelId).addImm(0);
@@ -549,7 +549,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const {
   }
   
   unsigned ReadyLabelId = 0;
-  if (needsFrameInfo) {
+  if (needsFrameMoves) {
     // Mark effective beginning of when frame pointer is ready.
     ReadyLabelId = MMI->NextLabelID();
     BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(ReadyLabelId).addImm(0);
@@ -608,7 +608,7 @@ void X86RegisterInfo::emitPrologue(MachineFunction &MF) const {
     }
   }
 
-  if (needsFrameInfo) {
+  if (needsFrameMoves) {
     std::vector<MachineMove> &Moves = MMI->getFrameMoves();
     const TargetData *TD = MF.getTarget().getTargetData();