Revert "DebugInfo: Don't include the name of the CU file in the line table file list when it's unneeded"

This reverts commit r201380 for now while we investigate.

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

Author: echristo

lib/CodeGen/AsmPrinter/DwarfDebug.cpp

@@ -756,6 +756,9 @@ DwarfCompileUnit *DwarfDebug::constructDwarfCompileUnit(DICompileUnit DIUnit) {
   InfoHolder.addUnit(NewCU);
 
   FileIDCUMap[NewCU->getUniqueID()] = 0;
+  // Call this to emit a .file directive if it wasn't emitted for the source
+  // file this CU comes from yet.
+  getOrCreateSourceID(FN, CompilationDir, NewCU->getUniqueID());
 
   NewCU->addString(Die, dwarf::DW_AT_producer, DIUnit.getProducer());
   NewCU->addUInt(Die, dwarf::DW_AT_language, dwarf::DW_FORM_data2,

lib/MC/MCObjectStreamer.cpp

@@ -379,8 +379,7 @@ void MCObjectStreamer::EmitZeros(uint64_t NumBytes) {
 void MCObjectStreamer::FinishImpl() {
   // Dump out the dwarf file & directory tables and line tables.
   const MCSymbol *LineSectionSymbol = NULL;
-  if (!getContext().getMCLineTableSymbols().empty() ||
-      getContext().hasDwarfFiles())
+  if (getContext().hasDwarfFiles())
     LineSectionSymbol = MCDwarfFileTable::Emit(this);
 
   // If we are generating dwarf for assembly source files dump out the sections.

test/DebugInfo/X86/generate-odr-hash.ll

@@ -125,14 +125,6 @@
 ; CHECK: DW_TAG_member
 ; CHECK-NEXT: DW_AT_name{{.*}}"a"
 
-; CHECK-LABEL: .debug_line contents:
-; CHECK: Line table prologue
-; CHECK-NOT: file_names[
-; CHECK: file_names{{.*}} bar.h
-; CHECK: file_names{{.*}} bar.cpp
-; CHECK-NOT: file_names[
-; CHECK-LABEL: .debug_str contents:
-
 ; Use the unit size as a rough hash/identifier for the unit we're dealing with
 ; it happens to be unambiguous at the moment, but it's hardly ideal.
 ; CHECK-LABEL: .debug_pubtypes contents: