Revert "[lldb] Add cast to fix compile error on 32-bit platforms"

This reverts commit f6012a2.

Revert "[lldb] Add cast to fix compile error on 32-but platforms"

This reverts commit d300337.

Revert "[lldb] Improve log message to include missing strings"

This reverts commit 0be3348.

Revert "[lldb] Add comment"

This reverts commit e2bb474.

Revert "[lldb] Implement a formatter bytecode interpreter in C++"

This reverts commit 9a9c1d4.

Author: sylvestre

lldb/include/lldb/DataFormatters/FormatterSection.h

@@ -1,4 +1,5 @@
-//===-- FormattersHelpers.h -------------------------------------*- C++ -*-===//
+//===-- FormattersHelpers.h --------------------------------------*- C++
+//-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

lldb/include/lldb/DataFormatters/FormattersHelpers.h

@@ -22,10 +22,6 @@
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/StructuredData.h"
 
-namespace llvm {
-class MemoryBuffer;
-}
-
 namespace lldb_private {
 class TypeSummaryOptions {
 public:
@@ -48,7 +44,7 @@ class TypeSummaryOptions {
 
 class TypeSummaryImpl {
 public:
-  enum class Kind { eSummaryString, eScript, eBytecode, eCallback, eInternal };
+  enum class Kind { eSummaryString, eScript, eCallback, eInternal };
 
   virtual ~TypeSummaryImpl() = default;
 
@@ -413,23 +409,6 @@ struct ScriptSummaryFormat : public TypeSummaryImpl {
   ScriptSummaryFormat(const ScriptSummaryFormat &) = delete;
   const ScriptSummaryFormat &operator=(const ScriptSummaryFormat &) = delete;
 };
-
-/// A summary formatter that is defined in LLDB formmater bytecode.
-class BytecodeSummaryFormat : public TypeSummaryImpl {
-  std::unique_ptr<llvm::MemoryBuffer> m_bytecode;
-
-public:
-  BytecodeSummaryFormat(const TypeSummaryImpl::Flags &flags,
-                        std::unique_ptr<llvm::MemoryBuffer> bytecode);
-  bool FormatObject(ValueObject *valobj, std::string &dest,
-                    const TypeSummaryOptions &options) override;
-  std::string GetDescription() override;
-  std::string GetName() override;
-  static bool classof(const TypeSummaryImpl *S) {
-    return S->GetKind() == Kind::eBytecode;
-  }
-};
-
 } // namespace lldb_private
 
 #endif // LLDB_DATAFORMATTERS_TYPESUMMARY_H

lldb/include/lldb/DataFormatters/TypeSummary.h

@@ -764,7 +764,6 @@ enum SectionType {
   eSectionTypeDWARFDebugTuIndex,
   eSectionTypeCTF,
   eSectionTypeLLDBTypeSummaries,
-  eSectionTypeLLDBFormatters,
   eSectionTypeSwiftModules,
 };
 

lldb/include/lldb/lldb-enumerations.h

@@ -343,7 +343,6 @@ bool SBTypeSummary::IsEqualTo(lldb::SBTypeSummary &rhs) {
   case TypeSummaryImpl::Kind::eCallback:
     return llvm::dyn_cast<CXXFunctionSummaryFormat>(m_opaque_sp.get()) ==
            llvm::dyn_cast<CXXFunctionSummaryFormat>(rhs.m_opaque_sp.get());
-  case TypeSummaryImpl::Kind::eBytecode:
   case TypeSummaryImpl::Kind::eScript:
     if (IsFunctionCode() != rhs.IsFunctionCode())
       return false;

lldb/source/API/SBTypeSummary.cpp

@@ -149,12 +149,10 @@ const char *Section::GetTypeAsCString() const {
     return "ctf";
   case eSectionTypeLLDBTypeSummaries:
     return "lldb-type-summaries";
-  case eSectionTypeLLDBFormatters:
-    return "lldb-formatters";
-  case eSectionTypeSwiftModules:
-    return "swift-modules";
   case eSectionTypeOther:
     return "regular";
+  case eSectionTypeSwiftModules:
+    return "swift-modules";
   }
   return "unknown";
 }
@@ -462,7 +460,6 @@ bool Section::ContainsOnlyDebugInfo() const {
   case eSectionTypeDWARFGNUDebugAltLink:
   case eSectionTypeCTF:
   case eSectionTypeLLDBTypeSummaries:
-  case eSectionTypeLLDBFormatters:
   case eSectionTypeSwiftModules:
     return true;
   }

lldb/source/Core/Section.cpp

@@ -5,9 +5,7 @@ add_lldb_library(lldbDataFormatters NO_PLUGIN_DEPENDENCIES
   FormatCache.cpp
   FormatClasses.cpp
   FormatManager.cpp
-  FormatterBytecode.cpp
   FormattersHelpers.cpp
-  FormatterSection.cpp
   LanguageCategory.cpp
   StringPrinter.cpp
   TypeCategory.cpp