Index: lib/CodeGen/LiveDebugValues.cpp
===================================================================
--- lib/CodeGen/LiveDebugValues.cpp
+++ lib/CodeGen/LiveDebugValues.cpp
@@ -668,8 +668,9 @@
 
         // Add any DBG_VALUE instructions necessitated by spills.
         for (auto &SP : Spills)
-          MBB->insertAfter(MachineBasicBlock::iterator(*SP.SpillInst),
-                           SP.DebugInst);
+          if( ! SP.SpillInst->isBundledWithSucc() ) // Don't break bundles.
+            MBB->insertAfter(MachineBasicBlock::iterator(*SP.SpillInst),
+                             SP.DebugInst);
         Spills.clear();
 
         DEBUG(printVarLocInMBB(MF, OutLocs, VarLocIDs,