mend

Author: Alex B

llvm/include/llvm/MC/MCDwarf.h

@@ -216,6 +216,9 @@ class MCDwarfLineEntry : public MCDwarfLoc {
 
   // Override the label with the given EndLabel.
   void setEndLabel(MCSymbol *EndLabel) {
+    // If we're setting this to be an end entry, make sure we don't have
+    // LineStreamLabel set.
+    assert(LineStreamLabel == nullptr);
     Label = EndLabel;
     IsEndEntry = true;
   }

llvm/lib/MC/MCDwarf.cpp

@@ -163,12 +163,13 @@ void MCLineSection::addEndEntry(MCSymbol *EndLabel) {
 
   // Create the end entry based on the last existing entry.
   MCDwarfLineEntry EndEntry = Entries.back();
-  EndEntry.setEndLabel(EndLabel);
+
   // An end entry is just for marking the end of a sequence of code locations.
   // It should not carry forward a LineStreamLabel from a previous special entry
   // if Entries.back() happened to be such an entry. So here we clear
   // LineStreamLabel.
   EndEntry.LineStreamLabel = nullptr;
+  EndEntry.setEndLabel(EndLabel);
   Entries.push_back(EndEntry);
 }