Print out a new label only if the debug location *tuple* is different. The debug

locations may change, but the tuples may be the same.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65039 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/DebugLoc.h b/include/llvm/CodeGen/DebugLoc.h
index 505292846dd6628ed1a60f70581cd8935218eb50..d5ad9dcafd92400d223b3c973386041da16e0496 100644 (file)
--- a/include/llvm/CodeGen/DebugLoc.h
+++ b/include/llvm/CodeGen/DebugLoc.h
@@ -27,6 +27,13 @@ namespace llvm {
 
     DebugLocTuple(unsigned s, unsigned l, unsigned c)
       : Src(s), Line(l), Col(c) {};
+
+    bool operator==(const DebugLocTuple &DLT) const {
+      return Src == DLT.Src && Line == DLT.Line && Col == DLT.Col;
+    }
+    bool operator!=(const DebugLocTuple &DLT) const {
+      return !(*this == DLT);
+    }
   };
 
   /// DebugLoc - Debug location id. This is carried by SDNode and MachineInstr

diff --git a/utils/TableGen/AsmWriterEmitter.cpp b/utils/TableGen/AsmWriterEmitter.cpp
index 6d2fa5578c9c7e99f40744ae7955d632e5e574ab..4f810c1303c37aa7d95fa81f65a2f821e7ec873e 100644 (file)
--- a/utils/TableGen/AsmWriterEmitter.cpp
+++ b/utils/TableGen/AsmWriterEmitter.cpp
@@ -642,13 +642,16 @@ void AsmWriterEmitter::run(std::ostream &O) {
 
   O << "  if (TAI->doesSupportDebugInformation()) {\n"
     << "    const MachineFunction *MF = MI->getParent()->getParent();\n"
-    << "    static DebugLoc PrevDL = DebugLoc::getUnknownLoc();\n"
     << "    DebugLoc CurDL = MI->getDebugLoc();\n\n"
-    << "    if (!CurDL.isUnknown() && PrevDL != CurDL) {\n"
-    << "      DebugLocTuple DLT = MF->getDebugLocTuple(CurDL);\n"
-    << "      printLabel(DW->RecordSourceLine(DLT.Line, DLT.Col, DLT.Src));\n"
-    << "    }\n\n"
-    << "    PrevDL = CurDL;\n"
+    << "    if (!CurDL.isUnknown()) {\n"
+    << "      static DebugLocTuple PrevDLT(~0U, ~0U, ~0U);\n"
+    << "      DebugLocTuple CurDLT = MF->getDebugLocTuple(CurDL);\n\n"
+    << "      if (PrevDLT != CurDLT) {\n"
+    << "        printLabel(DW->RecordSourceLine(CurDLT.Line, CurDLT.Col,\n"
+    << "                                        CurDLT.Src));\n"
+    << "        PrevDLT = CurDLT;\n"
+    << "      }\n"
+    << "    }\n"
     << "  }\n\n";
 
   O << "  if (MI->getOpcode() == TargetInstrInfo::INLINEASM) {\n"