commit 53946bf8c68da7661b065e16b07ff085e9641383
author Michael Kuperstein <michael.m.kuperstein@intel.com> Tue Dec 15 18:50:32 2015 +0000
committer Michael Kuperstein <michael.m.kuperstein@intel.com> Tue Dec 15 18:50:32 2015 +0000
tree 2846d5388f4942fe2c28b08d6c671a121907a147
parent 0abd28140bfb430ee69e6e0e4509eba593528d60

[X86] MOVPC32r should only emit CFI adjustments when needed

We only want to emit CFI adjustments when actually using DWARF.
This fixes PR25828.

Differential Revision: http://reviews.llvm.org/D15522

llvm-svn: 255664

llvm/lib/Target/X86/X86MCInstLower.cpp

diff --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
index af38680..d0c03d6 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -1145,11 +1145,12 @@
     bool hasFP = FrameLowering->hasFP(*MF);
     
     // TODO: This is needed only if we require precise CFA.
-    bool NeedsDwarfCFI = 
-         (MMI->hasDebugInfo() || MF->getFunction()->needsUnwindTableEntry());
+    bool HasActiveDwarfFrame = OutStreamer->getNumFrameInfos() &&
+                               !OutStreamer->getDwarfFrameInfos().back().End;
+
     int stackGrowth = -RI->getSlotSize();
 
-    if (NeedsDwarfCFI && !hasFP) {
+    if (HasActiveDwarfFrame && !hasFP) {
       OutStreamer->EmitCFIAdjustCfaOffset(-stackGrowth);
     }
 
@@ -1160,7 +1161,7 @@
     EmitAndCountInstruction(MCInstBuilder(X86::POP32r)
                             .addReg(MI->getOperand(0).getReg()));
 
-    if (NeedsDwarfCFI && !hasFP) {
+    if (HasActiveDwarfFrame && !hasFP) {
       OutStreamer->EmitCFIAdjustCfaOffset(stackGrowth);
     }
     return;