Revert Changing CodeView debug info type record representation in assembly files to make it more human-readable & editable

This reverts r364982 (git commit 2082bf28ebea76cc187b508f801122866420d9ff)

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

Author: nilanjana87

include/llvm/DebugInfo/CodeView/CVTypeVisitor.h

@@ -11,7 +11,6 @@
 
 #include "llvm/DebugInfo/CodeView/CVRecord.h"
 #include "llvm/DebugInfo/CodeView/TypeRecord.h"
-#include "llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h"
 #include "llvm/Support/Error.h"
 
 namespace llvm {
@@ -31,9 +30,6 @@ enum VisitorDataSource {
 Error visitTypeRecord(CVType &Record, TypeIndex Index,
                       TypeVisitorCallbacks &Callbacks,
                       VisitorDataSource Source = VDS_BytesPresent);
-Error visitTypeRecord(CVType &Record, TypeIndex Index,
-                      TypeVisitorCallbackPipeline &Callbacks,
-                      VisitorDataSource Source = VDS_BytesPresent);
 Error visitTypeRecord(CVType &Record, TypeVisitorCallbacks &Callbacks,
                       VisitorDataSource Source = VDS_BytesPresent);
 

include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h

@@ -24,64 +24,28 @@
 #include <type_traits>
 
 namespace llvm {
-
 namespace codeview {
 
-class CodeViewRecordStreamer {
-public:
-  virtual void EmitBytes(StringRef Data) = 0;
-  virtual void EmitIntValue(uint64_t Value, unsigned Size) = 0;
-  virtual void EmitBinaryData(StringRef Data) = 0;
-  virtual ~CodeViewRecordStreamer() = default;
-};
-
 class CodeViewRecordIO {
   uint32_t getCurrentOffset() const {
-    if (isWriting())
-      return Writer->getOffset();
-    else if (isReading())
-      return Reader->getOffset();
-    else
-      return 0;
+    return (isWriting()) ? Writer->getOffset() : Reader->getOffset();
   }
 
 public:
-  // deserializes records to structures
   explicit CodeViewRecordIO(BinaryStreamReader &Reader) : Reader(&Reader) {}
-
-  // serializes records to buffer
   explicit CodeViewRecordIO(BinaryStreamWriter &Writer) : Writer(&Writer) {}
 
-  // writes records to assembly file using MC library interface
-  explicit CodeViewRecordIO(CodeViewRecordStreamer &Streamer)
-      : Streamer(&Streamer) {}
-
   Error beginRecord(Optional<uint32_t> MaxLength);
   Error endRecord();
 
   Error mapInteger(TypeIndex &TypeInd);
 
-  bool isStreaming() const {
-    return (Streamer != nullptr) && (Reader == nullptr) && (Writer == nullptr);
-  }
-  bool isReading() const {
-    return (Reader != nullptr) && (Streamer == nullptr) && (Writer == nullptr);
-  }
-  bool isWriting() const {
-    return (Writer != nullptr) && (Streamer == nullptr) && (Reader == nullptr);
-  }
+  bool isReading() const { return Reader != nullptr; }
+  bool isWriting() const { return !isReading(); }
 
   uint32_t maxFieldLength() const;
 
   template <typename T> Error mapObject(T &Value) {
-    if (isStreaming()) {
-      StringRef BytesSR =
-          StringRef((reinterpret_cast<const char *>(&Value)), sizeof(Value));
-      Streamer->EmitBytes(BytesSR);
-      incrStreamedLen(sizeof(T));
-      return Error::success();
-    }
-
     if (isWriting())
       return Writer->writeObject(Value);
 
@@ -93,34 +57,25 @@ class CodeViewRecordIO {
   }
 
   template <typename T> Error mapInteger(T &Value) {
-    if (isStreaming()) {
-      Streamer->EmitIntValue((int)Value, sizeof(T));
-      incrStreamedLen(sizeof(T));
-      return Error::success();
-    }
-
     if (isWriting())
       return Writer->writeInteger(Value);
 
     return Reader->readInteger(Value);
   }
 
   template <typename T> Error mapEnum(T &Value) {
-    if (!isStreaming() && sizeof(Value) > maxFieldLength())
+    if (sizeof(Value) > maxFieldLength())
       return make_error<CodeViewError>(cv_error_code::insufficient_buffer);
 
     using U = typename std::underlying_type<T>::type;
     U X;
-
-    if (isWriting() || isStreaming())
+    if (isWriting())
       X = static_cast<U>(Value);
 
     if (auto EC = mapInteger(X))
       return EC;
-
     if (isReading())
       Value = static_cast<T>(X);
-
     return Error::success();
   }
 
@@ -135,16 +90,7 @@ class CodeViewRecordIO {
   template <typename SizeType, typename T, typename ElementMapper>
   Error mapVectorN(T &Items, const ElementMapper &Mapper) {
     SizeType Size;
-    if (isStreaming()) {
-      Size = static_cast<SizeType>(Items.size());
-      Streamer->EmitIntValue(Size, sizeof(Size));
-      incrStreamedLen(sizeof(Size)); // add 1 for the delimiter
-
-      for (auto &X : Items) {
-        if (auto EC = Mapper(*this, X))
-          return EC;
-      }
-    } else if (isWriting()) {
+    if (isWriting()) {
       Size = static_cast<SizeType>(Items.size());
       if (auto EC = Writer->writeInteger(Size))
         return EC;
@@ -169,7 +115,7 @@ class CodeViewRecordIO {
 
   template <typename T, typename ElementMapper>
   Error mapVectorTail(T &Items, const ElementMapper &Mapper) {
-    if (isStreaming() || isWriting()) {
+    if (isWriting()) {
       for (auto &Item : Items) {
         if (auto EC = Mapper(*this, Item))
           return EC;
@@ -192,28 +138,10 @@ class CodeViewRecordIO {
   Error padToAlignment(uint32_t Align);
   Error skipPadding();
 
-  uint64_t getStreamedLen() {
-    if (isStreaming())
-      return StreamedLen;
-    return 0;
-  }
-
 private:
-  void emitEncodedSignedInteger(const int64_t &Value);
-  void emitEncodedUnsignedInteger(const uint64_t &Value);
   Error writeEncodedSignedInteger(const int64_t &Value);
   Error writeEncodedUnsignedInteger(const uint64_t &Value);
 
-  void incrStreamedLen(const uint64_t &Len) {
-    if (isStreaming())
-      StreamedLen += Len;
-  }
-
-  void resetStreamedLen() {
-    if (isStreaming())
-      StreamedLen = 4; // The record prefix is 4 bytes long
-  }
-
   struct RecordLimit {
     uint32_t BeginOffset;
     Optional<uint32_t> MaxLength;
@@ -234,8 +162,6 @@ class CodeViewRecordIO {
 
   BinaryStreamReader *Reader = nullptr;
   BinaryStreamWriter *Writer = nullptr;
-  CodeViewRecordStreamer *Streamer = nullptr;
-  uint64_t StreamedLen = 0;
 };
 
 } // end namespace codeview

include/llvm/DebugInfo/CodeView/TypeRecordMapping.h

@@ -23,11 +23,9 @@ class TypeRecordMapping : public TypeVisitorCallbacks {
 public:
   explicit TypeRecordMapping(BinaryStreamReader &Reader) : IO(Reader) {}
   explicit TypeRecordMapping(BinaryStreamWriter &Writer) : IO(Writer) {}
-  explicit TypeRecordMapping(CodeViewRecordStreamer &Streamer) : IO(Streamer) {}
 
   using TypeVisitorCallbacks::visitTypeBegin;
   Error visitTypeBegin(CVType &Record) override;
-  Error visitTypeBegin(CVType &Record, TypeIndex Index) override;
   Error visitTypeEnd(CVType &Record) override;
 
   Error visitMemberBegin(CVMemberRecord &Record) override;

include/llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h

@@ -82,11 +82,6 @@ class TypeVisitorCallbackPipeline : public TypeVisitorCallbacks {
     Pipeline.push_back(&Callbacks);
   }
 
-  void addCallbackToPipelineFront(TypeVisitorCallbacks &Callbacks) {
-    auto CallBackItr = Pipeline.begin();
-    Pipeline.insert(CallBackItr, &Callbacks);
-  }
-
 #define TYPE_RECORD(EnumName, EnumVal, Name)                                   \
   Error visitKnownRecord(CVType &CVR, Name##Record &Record) override {         \
     return visitKnownRecordImpl(CVR, Record);                                  \

lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

@@ -51,7 +51,6 @@
 #include "llvm/DebugInfo/CodeView/TypeIndex.h"
 #include "llvm/DebugInfo/CodeView/TypeRecord.h"
 #include "llvm/DebugInfo/CodeView/TypeTableCollection.h"
-#include "llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/DebugInfoMetadata.h"
@@ -95,24 +94,6 @@
 using namespace llvm;
 using namespace llvm::codeview;
 
-namespace {
-class CVMCAdapter : public CodeViewRecordStreamer {
-public:
-  CVMCAdapter(MCStreamer &OS) : OS(&OS) {}
-
-  void EmitBytes(StringRef Data) { OS->EmitBytes(Data); }
-
-  void EmitIntValue(uint64_t Value, unsigned Size) {
-    OS->EmitIntValue(Value, Size);
-  }
-
-  void EmitBinaryData(StringRef Data) { OS->EmitBinaryData(Data); }
-
-private:
-  MCStreamer *OS = nullptr;
-};
-} // namespace
-
 static CPUType mapArchToCVCPUType(Triple::ArchType Type) {
   switch (Type) {
   case Triple::ArchType::x86:
@@ -636,40 +617,26 @@ void CodeViewDebug::emitTypeInformation() {
     // This will fail if the record data is invalid.
     CVType Record = Table.getType(*B);
 
-    TypeVisitorCallbackPipeline Pipeline;
-    CVMCAdapter CVMCOS(OS);
-    TypeRecordMapping typeMapping(CVMCOS);
-    SmallString<512> CommentBlock;
-    raw_svector_ostream CommentOS(CommentBlock);
-
     if (OS.isVerboseAsm()) {
       // Emit a block comment describing the type record for readability.
+      SmallString<512> CommentBlock;
+      raw_svector_ostream CommentOS(CommentBlock);
       ScopedPrinter SP(CommentOS);
       SP.setPrefix(CommentPrefix);
       TypeDumpVisitor TDV(Table, &SP, false);
-      Pipeline.addCallbackToPipeline(TDV);
-    }
-    Pipeline.addCallbackToPipeline(typeMapping);
-
-    auto RecordLen = Record.length();
-    auto RecordKind = Record.kind();
-    OS.EmitIntValue(RecordLen - 2, 2);
-    OS.EmitIntValue(RecordKind, sizeof(RecordKind));
-
-    Error E = codeview::visitTypeRecord(Record, *B, Pipeline);
 
-    if (E) {
-      logAllUnhandledErrors(std::move(E), errs(), "error: ");
-      llvm_unreachable("produced malformed type record");
-    }
-
-    if (OS.isVerboseAsm()) {
+      Error E = codeview::visitTypeRecord(Record, *B, TDV);
+      if (E) {
+        logAllUnhandledErrors(std::move(E), errs(), "error: ");
+        llvm_unreachable("produced malformed type record");
+      }
       // emitRawComment will insert its own tab and comment string before
       // the first line, so strip off our first one. It also prints its own
       // newline.
       OS.emitRawComment(
           CommentOS.str().drop_front(CommentPrefix.size() - 1).rtrim());
     }
+    OS.EmitBinaryData(Record.str_data());
     B = Table.getNext(*B);
   }
 }

lib/DebugInfo/CodeView/CVTypeVisitor.cpp

@@ -209,14 +209,6 @@ struct VisitHelper {
     }
   }
 
-  VisitHelper(TypeVisitorCallbackPipeline &Callbacks, VisitorDataSource Source)
-      : Visitor((Source == VDS_BytesPresent) ? Pipeline : Callbacks) {
-    if (Source == VDS_BytesPresent) {
-      Pipeline = Callbacks;
-      Pipeline.addCallbackToPipelineFront(Deserializer);
-    }
-  }
-
   TypeDeserializer Deserializer;
   TypeVisitorCallbackPipeline Pipeline;
   CVTypeVisitor Visitor;
@@ -230,13 +222,6 @@ Error llvm::codeview::visitTypeRecord(CVType &Record, TypeIndex Index,
   return V.Visitor.visitTypeRecord(Record, Index);
 }
 
-Error llvm::codeview::visitTypeRecord(CVType &Record, TypeIndex Index,
-                                      TypeVisitorCallbackPipeline &Callbacks,
-                                      VisitorDataSource Source) {
-  VisitHelper V(Callbacks, Source);
-  return V.Visitor.visitTypeRecord(Record, Index);
-}
-
 Error llvm::codeview::visitTypeRecord(CVType &Record,
                                       TypeVisitorCallbacks &Callbacks,
                                       VisitorDataSource Source) {