commit 804d7ab811766a11559d81116f16635e06f91f43
author Eli Friedman <efriedma@codeaurora.org> Wed Jan 31 00:40:42 2018 +0000
committer Eli Friedman <efriedma@codeaurora.org> Wed Jan 31 00:40:42 2018 +0000
tree 9e3a56898de4c542b24c9d0df02ef20db79b12ca
parent f98baa7065084fd9326e46d52acaedabdbb82f80

Revert r323559 due to EXPENSIVE_CHECKS regression.

I have a fix for the issue (https://reviews.llvm.org/D42655) but
it's taking a while to get reviewed, so reverting in the meantime.

llvm-svn: 323841

llvm/lib/CodeGen/LivePhysRegs.cpp

diff --git a/llvm/lib/CodeGen/LivePhysRegs.cpp b/llvm/lib/CodeGen/LivePhysRegs.cpp
index c07fa16..f4b43a9 100644
--- a/llvm/lib/CodeGen/LivePhysRegs.cpp
+++ b/llvm/lib/CodeGen/LivePhysRegs.cpp
@@ -225,10 +225,10 @@
 
 void LivePhysRegs::addLiveOuts(const MachineBasicBlock &MBB) {
   const MachineFunction &MF = *MBB.getParent();
-  if (!MBB.isReturnBlock()) {
+  if (!MBB.succ_empty()) {
     addPristines(MF);
     addLiveOutsNoPristines(MBB);
-  } else {
+  } else if (MBB.isReturnBlock()) {
     // For the return block: Add all callee saved registers.
     const MachineFrameInfo &MFI = MF.getFrameInfo();
     if (MFI.isCalleeSavedInfoValid())