commit b66cb88c2e29cb032d1efe08ad64d1bfa72d3780
author Kostya Serebryany <kcc@google.com> Thu Dec 01 02:06:56 2016 +0000
committer Kostya Serebryany <kcc@google.com> Thu Dec 01 02:06:56 2016 +0000
tree 5cabb8a77ac3e20f96f2d0504dcd5c2e2477b94a
parent 73f438ef9ac736590a47975dbb72afcbf2156b50

revert r288283 as it causes debug info (line numbers) to be lost in instrumented code. also revert r288299 which was a workaround for the problem.

llvm-svn: 288300

llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
index 5607242..d30f106 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
@@ -201,10 +201,8 @@
   assert(CurMI != nullptr);
   // Don't create a new label after DBG_VALUE instructions.
   // They don't generate code.
-  if (!CurMI->isDebugValue()) {
+  if (!CurMI->isDebugValue())
     PrevLabel = nullptr;
-    PrevInstBB = CurMI->getParent();
-  }
 
   DenseMap<const MachineInstr *, MCSymbol *>::iterator I =
       LabelsAfterInsn.find(CurMI);