commit 80244258016b559b2c8ff8e64a7f588dcc543d90
author Eric Christopher <echristo@gmail.com> Tue May 01 00:10:13 2018 +0000
committer Eric Christopher <echristo@gmail.com> Tue May 01 00:10:13 2018 +0000
tree 5422ba89d48e95c47d0672e949245821a1468d08
parent c9f7939121b8acf47ca940e9cae29cfc81386e55

Temporarily revert "[DEBUG] Initial adaptation of NVPTX target for debug info emission."

This appears to have some issues associated with the file directive output
causing multiple global symbols with the name "file" to be emitted into a
startup section. I'm investigating more specific causes and working with the
original author.

This reverts commit r330271.

Also Revert "[DEBUGINFO, NVPTX] Add the test for the debug info of the local"

This reverts commit r330592 and the follow up of 330779 as the testcase is dependent upon r330271.

llvm-svn: 331237

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index c8740d7..a8e36ec 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -312,11 +312,7 @@
   } else
     TheAccelTableKind = AccelTables;
 
-  if (DwarfInlinedStrings == Default)
-    UseInlineStrings = TT.isNVPTX();
-  else
-    UseInlineStrings = DwarfInlinedStrings == Enable;
-
+  UseInlineStrings = DwarfInlinedStrings == Enable;
   HasAppleExtensionAttributes = tuneForLLDB();
 
   // Handle split DWARF.
@@ -331,18 +327,14 @@
   unsigned DwarfVersionNumber = Asm->TM.Options.MCOptions.DwarfVersion;
   unsigned DwarfVersion = DwarfVersionNumber ? DwarfVersionNumber
                                     : MMI->getModule()->getDwarfVersion();
-  // Use dwarf 4 by default if nothing is requested. For NVPTX, use dwarf 2.
-  DwarfVersion =
-      TT.isNVPTX() ? 2 : (DwarfVersion ? DwarfVersion : dwarf::DWARF_VERSION);
+  // Use dwarf 4 by default if nothing is requested.
+  DwarfVersion = DwarfVersion ? DwarfVersion : dwarf::DWARF_VERSION;
 
-  UsePubSections = !NoDwarfPubSections && !TT.isNVPTX();
-  UseRangesSection = !NoDwarfRangesSection && !TT.isNVPTX();
+  UsePubSections = !NoDwarfPubSections;
+  UseRangesSection = !NoDwarfRangesSection;
 
-  // Use sections as references. Force for NVPTX.
-  if (DwarfSectionsAsReferences == Default)
-    UseSectionsAsReferences = TT.isNVPTX();
-  else
-    UseSectionsAsReferences = DwarfSectionsAsReferences == Enable;
+  // Use sections as references.
+  UseSectionsAsReferences = DwarfSectionsAsReferences == Enable;
 
   // Work around a GDB bug. GDB doesn't support the standard opcode;
   // SCE doesn't support GNU's; LLDB prefers the standard opcode, which