diff options
| author | Daniel Jasper <djasper@google.com> | 2017-06-29 13:58:24 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2017-06-29 13:58:24 +0000 |
| commit | 559aa75382e941a1c0c2fc5724d5274c20f2adf8 (patch) | |
| tree | c8f215d8add480f68484fcc2ef8043b94f967598 /llvm/lib/CodeGen/TailDuplicator.cpp | |
| parent | 8a44b7be76f35f26d56327952bd133a48c07f301 (diff) | |
| download | bcm5719-llvm-559aa75382e941a1c0c2fc5724d5274c20f2adf8.tar.gz bcm5719-llvm-559aa75382e941a1c0c2fc5724d5274c20f2adf8.zip | |
Revert "r306529 - [X86] Correct dwarf unwind information in function epilogue"
I am 99% sure that this breaks the PPC ASAN build bot:
http://lab.llvm.org:8011/builders/sanitizer-ppc64be-linux/builds/3112/steps/64-bit%20check-asan/logs/stdio
If it doesn't go back to green, we can recommit (and fix the original
commit message at the same time :) ).
llvm-svn: 306676
Diffstat (limited to 'llvm/lib/CodeGen/TailDuplicator.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/TailDuplicator.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/llvm/lib/CodeGen/TailDuplicator.cpp b/llvm/lib/CodeGen/TailDuplicator.cpp index 62ce903535b..dc7265dcf6c 100644 --- a/llvm/lib/CodeGen/TailDuplicator.cpp +++ b/llvm/lib/CodeGen/TailDuplicator.cpp @@ -604,8 +604,8 @@ bool TailDuplicator::shouldTailDuplicate(bool IsSimple, if (PreRegAlloc && MI.isCall()) return false; - if (!MI.isPHI() && !MI.isDirective()) - InstrCount += 1; + if (!MI.isPHI() && !MI.isDebugValue()) + InstrCount += 1; if (InstrCount > MaxDuplicateCount) return false; @@ -857,9 +857,6 @@ bool TailDuplicator::tailDuplicate(bool IsSimple, MachineBasicBlock *TailBB, for (MachineBasicBlock *Succ : TailBB->successors()) PredBB->addSuccessor(Succ, MBPI->getEdgeProbability(TailBB, Succ)); - // Update the CFI info for PredBB. - PredBB->mergeCFIInfo(TailBB); - Changed = true; ++NumTailDups; } @@ -920,9 +917,6 @@ bool TailDuplicator::tailDuplicate(bool IsSimple, MachineBasicBlock *TailBB, PrevBB->transferSuccessors(TailBB); TDBBs.push_back(PrevBB); Changed = true; - - // Update the CFI info for PrevBB. - PrevBB->mergeCFIInfo(TailBB); } // If this is after register allocation, there are no phis to fix. |
