Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
+++ lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
@@ -215,6 +215,7 @@
 
   void finishSubprogramDefinition(const DISubprogram *SP);
   void finishVariableDefinition(const DbgVariable &Var);
+  void finishLabelDefinition(const DbgLabel &Label);
 
   /// Find abstract variable associated with Var.
   using InlinedVariable = DbgValueHistoryMap::InlinedVariable;
Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -829,6 +829,17 @@
     applyVariableAttributes(Var, *VariableDie);
 }
 
+void DwarfCompileUnit::finishLabelDefinition(const DbgLabel &Label) {
+  auto *LabelDie = Label.getDIE();
+  StringRef Name = Label.getName();
+  if (!Name.empty())
+    addString(*LabelDie, dwarf::DW_AT_name, Name);
+  const auto *DILabel = Label.getLabel();
+  addSourceLine(*LabelDie, DILabel);
+  const MCSymbol *Sym = Label.getSymbol();
+  addLabelAddress(*LabelDie, dwarf::DW_AT_low_pc, Sym);
+}
+
 DbgVariable *DwarfCompileUnit::getExistingAbstractVariable(InlinedVariable IV) {
   const DILocalVariable *Cleansed;
   return getExistingAbstractVariable(IV, Cleansed);
Index: lib/CodeGen/AsmPrinter/DwarfDebug.h
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -372,6 +372,8 @@
 
   void finishVariableDefinitions();
 
+  void finishLabelDefinitions();
+
   void finishSubprogramDefinitions();
 
   /// Finish off debug information after all functions have been
Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -694,6 +694,16 @@
   }
 }
 
+void DwarfDebug::finishLabelDefinitions() {
+  for (const auto &Label : GotoLabels) {
+    DIE *LabelDie = Label->getDIE();
+    assert(LabelDie);
+    DwarfCompileUnit *Unit = CUDieMap.lookup(LabelDie->getUnitDie());
+    assert(Unit);
+    Unit->finishLabelDefinition(*Label);
+  }
+}
+
 void DwarfDebug::finishSubprogramDefinitions() {
   for (const DISubprogram *SP : ProcessedSPNodes) {
     assert(SP->getUnit()->getEmissionKind() != DICompileUnit::NoDebug);
@@ -710,6 +720,8 @@
 
   finishVariableDefinitions();
 
+  finishLabelDefinitions();
+
   // Include the DWO file name in the hash if there's more than one CU.
   // This handles ThinLTO's situation where imported CUs may very easily be
   // duplicate with the same CU partially imported into another ThinLTO unit.
Index: lib/CodeGen/AsmPrinter/DwarfUnit.h
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfUnit.h
+++ lib/CodeGen/AsmPrinter/DwarfUnit.h
@@ -211,6 +211,7 @@
   void addSourceLine(DIE &Die, const DILocalVariable *V);
   void addSourceLine(DIE &Die, const DIGlobalVariable *G);
   void addSourceLine(DIE &Die, const DISubprogram *SP);
+  void addSourceLine(DIE &Die, const DILabel *L);
   void addSourceLine(DIE &Die, const DIType *Ty);
   void addSourceLine(DIE &Die, const DIObjCProperty *Ty);
 
Index: lib/CodeGen/AsmPrinter/DwarfUnit.cpp
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -404,6 +404,12 @@
   addSourceLine(Die, SP->getLine(), SP->getFile());
 }
 
+void DwarfUnit::addSourceLine(DIE &Die, const DILabel *L) {
+  assert(L);
+
+  addSourceLine(Die, L->getLine(), L->getFile());
+}
+
 void DwarfUnit::addSourceLine(DIE &Die, const DIType *Ty) {
   assert(Ty);