Revert "debuginfo: Use symbol difference for CU length to simplify assembly reading/editing"

Temporarily reverts commit r348806 due to strange asm compilation issues in certain modes (combination of asan+cuda+other things). Will provide repro soon.

llvm-svn: 348898

3 files changed, 1 insertions, 16 deletions

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp
index 094c654943d..4e410bb49be 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp
@@ -46,8 +46,6 @@ void DwarfFile::emitUnit(DwarfUnit *TheU, bool UseOffsets) {
   TheU->emitHeader(UseOffsets);
 
   Asm->emitDwarfDIE(Die);
-
-  Asm->OutStreamer->EmitLabel(TheU->getEndLabel());
 }
 
 // Compute the size and offset for each DIE.
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index 90b91180c80..2053395808f 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -38,7 +38,6 @@
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
-#include "llvm/Target/TargetMachine.h"
 #include <cassert>
 #include <cstdint>
 #include <string>
@@ -1554,17 +1553,7 @@ DIE *DwarfUnit::getOrCreateStaticMemberDIE(const DIDerivedType *DT) {
 void DwarfUnit::emitCommonHeader(bool UseOffsets, dwarf::UnitType UT) {
   // Emit size of content not including length itself
   Asm->OutStreamer->AddComment("Length of Unit");
-  StringRef Prefix = isDwoUnit() ? "debug_info_dwo_" : "debug_info_";
-  MCSymbol *BeginLabel = Asm->createTempSymbol(Prefix + "start");
-  EndLabel = Asm->createTempSymbol(Prefix + "end");
-
-  // Use a label difference for the convenience of legible/easily modified
-  // assembly - except on NVPTX where label differences aren't supported.
-  if (Asm->TM.getTargetTriple().isNVPTX())
-    Asm->emitInt32(getHeaderSize() + getUnitDie().getSize());
-  else
-    Asm->EmitLabelDifference(EndLabel, BeginLabel, 4);
-  Asm->OutStreamer->EmitLabel(BeginLabel);
+  Asm->emitInt32(getHeaderSize() + getUnitDie().getSize());
 
   Asm->OutStreamer->AddComment("DWARF version number");
   unsigned Version = DD->getDwarfVersion();
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
index ec67c4b1cda..860d1653184 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
@@ -48,7 +48,6 @@ protected:
 
   /// Target of Dwarf emission.
   AsmPrinter *Asm;
-  MCSymbol *EndLabel;
 
   // Holders for some common dwarf information.
   DwarfDebug *DD;
@@ -83,7 +82,6 @@ protected:
 public:
   // Accessors.
   AsmPrinter* getAsmPrinter() const { return Asm; }
-  MCSymbol *getEndLabel() const { return EndLabel; }
   uint16_t getLanguage() const { return CUNode->getSourceLanguage(); }
   const DICompileUnit *getCUNode() const { return CUNode; }