Revert "[lldb] Add reproducer verifier"

This reverts commit 297f69a. It broke
the Fedora 33 x86-64 bot. See the review for more info.

Author: Teemperor

lldb/include/lldb/API/SBReproducer.h

@@ -11,32 +11,8 @@
 
 #include "lldb/API/SBDefines.h"
 
-namespace lldb_private {
-namespace repro {
-struct ReplayOptions;
-}
-} // namespace lldb_private
-
 namespace lldb {
 
-class LLDB_API SBReplayOptions {
-public:
-  SBReplayOptions();
-  SBReplayOptions(const SBReplayOptions &rhs);
-  ~SBReplayOptions();
-
-  SBReplayOptions &operator=(const SBReplayOptions &rhs);
-
-  void SetVerify(bool verify);
-  bool GetVerify() const;
-
-  void SetCheckVersion(bool check);
-  bool GetCheckVersion() const;
-
-private:
-  std::unique_ptr<lldb_private::repro::ReplayOptions> m_opaque_up;
-};
-
 /// The SBReproducer class is special because it bootstraps the capture and
 /// replay of SB API calls. As a result we cannot rely on any other SB objects
 /// in the interface or implementation of this class.
@@ -46,7 +22,6 @@ class LLDB_API SBReproducer {
   static const char *Capture(const char *path);
   static const char *Replay(const char *path);
   static const char *Replay(const char *path, bool skip_version_check);
-  static const char *Replay(const char *path, const SBReplayOptions &options);
   static const char *PassiveReplay(const char *path);
   static const char *GetPath();
   static bool SetAutoGenerate(bool b);

lldb/include/lldb/Utility/Reproducer.h

@@ -227,22 +227,6 @@ class Reproducer {
   mutable std::mutex m_mutex;
 };
 
-class Verifier {
-public:
-  Verifier(Loader *loader) : m_loader(loader) {}
-  void Verify(llvm::function_ref<void(llvm::StringRef)> error_callback,
-              llvm::function_ref<void(llvm::StringRef)> warning_callback,
-              llvm::function_ref<void(llvm::StringRef)> note_callback) const;
-
-private:
-  Loader *m_loader;
-};
-
-struct ReplayOptions {
-  bool verify = true;
-  bool check_version = true;
-};
-
 } // namespace repro
 } // namespace lldb_private
 

lldb/source/API/SBReproducer.cpp

@@ -30,33 +30,6 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::repro;
 
-SBReplayOptions::SBReplayOptions()
-    : m_opaque_up(std::make_unique<ReplayOptions>()){};
-
-SBReplayOptions::SBReplayOptions(const SBReplayOptions &rhs)
-    : m_opaque_up(std::make_unique<ReplayOptions>(*rhs.m_opaque_up)) {}
-
-SBReplayOptions::~SBReplayOptions() = default;
-
-SBReplayOptions &SBReplayOptions::operator=(const SBReplayOptions &rhs) {
-  if (this == &rhs)
-    return *this;
-  *m_opaque_up = *rhs.m_opaque_up;
-  return *this;
-}
-
-void SBReplayOptions::SetVerify(bool verify) { m_opaque_up->verify = verify; }
-
-bool SBReplayOptions::GetVerify() const { return m_opaque_up->verify; }
-
-void SBReplayOptions::SetCheckVersion(bool check) {
-  m_opaque_up->check_version = check;
-}
-
-bool SBReplayOptions::GetCheckVersion() const {
-  return m_opaque_up->check_version;
-}
-
 SBRegistry::SBRegistry() {
   Registry &R = *this;
 
@@ -190,18 +163,10 @@ const char *SBReproducer::PassiveReplay(const char *path) {
 }
 
 const char *SBReproducer::Replay(const char *path) {
-  SBReplayOptions options;
-  return SBReproducer::Replay(path, options);
+  return SBReproducer::Replay(path, false);
 }
 
 const char *SBReproducer::Replay(const char *path, bool skip_version_check) {
-  SBReplayOptions options;
-  options.SetCheckVersion(!skip_version_check);
-  return SBReproducer::Replay(path, options);
-}
-
-const char *SBReproducer::Replay(const char *path,
-                                 const SBReplayOptions &options) {
   static std::string error;
   if (auto e = Reproducer::Initialize(ReproducerMode::Replay, FileSpec(path))) {
     error = llvm::toString(std::move(e));
@@ -214,7 +179,7 @@ const char *SBReproducer::Replay(const char *path,
     return error.c_str();
   }
 
-  if (options.GetCheckVersion()) {
+  if (!skip_version_check) {
     llvm::Expected<std::string> version = loader->LoadBuffer<VersionProvider>();
     if (!version) {
       error = llvm::toString(version.takeError());
@@ -230,30 +195,6 @@ const char *SBReproducer::Replay(const char *path,
     }
   }
 
-  if (options.GetVerify()) {
-    bool verification_failed = false;
-    llvm::raw_string_ostream os(error);
-    auto error_callback = [&](llvm::StringRef error) {
-      verification_failed = true;
-      os << "\nerror: " << error;
-    };
-
-    auto warning_callback = [&](llvm::StringRef warning) {
-      verification_failed = true;
-      os << "\nwarning: " << warning;
-    };
-
-    auto note_callback = [&](llvm::StringRef warning) {};
-
-    Verifier verifier(loader);
-    verifier.Verify(error_callback, warning_callback, note_callback);
-
-    if (verification_failed) {
-      os.flush();
-      return error.c_str();
-    }
-  }
-
   FileSpec file = loader->GetFile<SBProvider::Info>();
   if (!file) {
     error = "unable to get replay data from reproducer.";

lldb/source/Commands/CommandObjectReproducer.cpp

@@ -116,9 +116,6 @@ static constexpr OptionEnumValues ReproducerSignalType() {
 #define LLDB_OPTIONS_reproducer_xcrash
 #include "CommandOptions.inc"
 
-#define LLDB_OPTIONS_reproducer_verify
-#include "CommandOptions.inc"
-
 template <typename T>
 llvm::Expected<T> static ReadFromYAML(StringRef filename) {
   auto error_or_file = MemoryBuffer::getFile(filename);
@@ -137,38 +134,6 @@ llvm::Expected<T> static ReadFromYAML(StringRef filename) {
   return t;
 }
 
-static void SetError(CommandReturnObject &result, Error err) {
-  result.GetErrorStream().Printf("error: %s\n",
-                                 toString(std::move(err)).c_str());
-  result.SetStatus(eReturnStatusFailed);
-}
-
-/// Create a loader from the given path if specified. Otherwise use the current
-/// loader used for replay.
-static Loader *
-GetLoaderFromPathOrCurrent(llvm::Optional<Loader> &loader_storage,
-                           CommandReturnObject &result,
-                           FileSpec reproducer_path) {
-  if (reproducer_path) {
-    loader_storage.emplace(reproducer_path);
-    Loader *loader = &(*loader_storage);
-    if (Error err = loader->LoadIndex()) {
-      // This is a hard error and will set the result to eReturnStatusFailed.
-      SetError(result, std::move(err));
-      return nullptr;
-    }
-    return loader;
-  }
-
-  if (Loader *loader = Reproducer::Instance().GetLoader())
-    return loader;
-
-  // This is a soft error because this is expected to fail during capture.
-  result.SetError("Not specifying a reproducer is only support during replay.");
-  result.SetStatus(eReturnStatusSuccessFinishNoResult);
-  return nullptr;
-}
-
 class CommandObjectReproducerGenerate : public CommandObjectParsed {
 public:
   CommandObjectReproducerGenerate(CommandInterpreter &interpreter)
@@ -347,6 +312,12 @@ class CommandObjectReproducerStatus : public CommandObjectParsed {
   }
 };
 
+static void SetError(CommandReturnObject &result, Error err) {
+  result.GetErrorStream().Printf("error: %s\n",
+                                 toString(std::move(err)).c_str());
+  result.SetStatus(eReturnStatusFailed);
+}
+
 class CommandObjectReproducerDump : public CommandObjectParsed {
 public:
   CommandObjectReproducerDump(CommandInterpreter &interpreter)
@@ -411,11 +382,29 @@ class CommandObjectReproducerDump : public CommandObjectParsed {
       return false;
     }
 
+    // If no reproducer path is specified, use the loader currently used for
+    // replay. Otherwise create a new loader just for dumping.
     llvm::Optional<Loader> loader_storage;
-    Loader *loader =
-        GetLoaderFromPathOrCurrent(loader_storage, result, m_options.file);
-    if (!loader)
-      return false;
+    Loader *loader = nullptr;
+    if (!m_options.file) {
+      loader = Reproducer::Instance().GetLoader();
+      if (loader == nullptr) {
+        result.SetError(
+            "Not specifying a reproducer is only support during replay.");
+        result.SetStatus(eReturnStatusSuccessFinishNoResult);
+        return false;
+      }
+    } else {
+      loader_storage.emplace(m_options.file);
+      loader = &(*loader_storage);
+      if (Error err = loader->LoadIndex()) {
+        SetError(result, std::move(err));
+        return false;
+      }
+    }
+
+    // If we get here we should have a valid loader.
+    assert(loader);
 
     switch (m_options.provider) {
     case eReproducerProviderFiles: {
@@ -594,101 +583,6 @@ class CommandObjectReproducerDump : public CommandObjectParsed {
   CommandOptions m_options;
 };
 
-class CommandObjectReproducerVerify : public CommandObjectParsed {
-public:
-  CommandObjectReproducerVerify(CommandInterpreter &interpreter)
-      : CommandObjectParsed(interpreter, "reproducer verify",
-                            "Verify the contents of a reproducer. "
-                            "If no reproducer is specified during replay, it "
-                            "verifies the content of the current reproducer.",
-                            nullptr) {}
-
-  ~CommandObjectReproducerVerify() override = default;
-
-  Options *GetOptions() override { return &m_options; }
-
-  class CommandOptions : public Options {
-  public:
-    CommandOptions() : Options(), file() {}
-
-    ~CommandOptions() override = default;
-
-    Status SetOptionValue(uint32_t option_idx, StringRef option_arg,
-                          ExecutionContext *execution_context) override {
-      Status error;
-      const int short_option = m_getopt_table[option_idx].val;
-
-      switch (short_option) {
-      case 'f':
-        file.SetFile(option_arg, FileSpec::Style::native);
-        FileSystem::Instance().Resolve(file);
-        break;
-      default:
-        llvm_unreachable("Unimplemented option");
-      }
-
-      return error;
-    }
-
-    void OptionParsingStarting(ExecutionContext *execution_context) override {
-      file.Clear();
-    }
-
-    ArrayRef<OptionDefinition> GetDefinitions() override {
-      return makeArrayRef(g_reproducer_verify_options);
-    }
-
-    FileSpec file;
-  };
-
-protected:
-  bool DoExecute(Args &command, CommandReturnObject &result) override {
-    if (!command.empty()) {
-      result.AppendErrorWithFormat("'%s' takes no arguments",
-                                   m_cmd_name.c_str());
-      return false;
-    }
-
-    llvm::Optional<Loader> loader_storage;
-    Loader *loader =
-        GetLoaderFromPathOrCurrent(loader_storage, result, m_options.file);
-    if (!loader)
-      return false;
-
-    bool errors = false;
-    auto error_callback = [&](llvm::StringRef error) {
-      errors = true;
-      result.AppendError(error);
-    };
-
-    bool warnings = false;
-    auto warning_callback = [&](llvm::StringRef warning) {
-      warnings = true;
-      result.AppendWarning(warning);
-    };
-
-    auto note_callback = [&](llvm::StringRef warning) {
-      result.AppendMessage(warning);
-    };
-
-    Verifier verifier(loader);
-    verifier.Verify(error_callback, warning_callback, note_callback);
-
-    if (warnings || errors) {
-      result.AppendMessage("reproducer verification failed");
-      result.SetStatus(eReturnStatusFailed);
-    } else {
-      result.AppendMessage("reproducer verification succeeded");
-      result.SetStatus(eReturnStatusSuccessFinishResult);
-    }
-
-    return result.Succeeded();
-  }
-
-private:
-  CommandOptions m_options;
-};
-
 CommandObjectReproducer::CommandObjectReproducer(
     CommandInterpreter &interpreter)
     : CommandObjectMultiword(
@@ -711,8 +605,6 @@ CommandObjectReproducer::CommandObjectReproducer(
                                new CommandObjectReproducerStatus(interpreter)));
   LoadSubCommand("dump",
                  CommandObjectSP(new CommandObjectReproducerDump(interpreter)));
-  LoadSubCommand("verify", CommandObjectSP(
-                               new CommandObjectReproducerVerify(interpreter)));
   LoadSubCommand("xcrash", CommandObjectSP(
                                new CommandObjectReproducerXCrash(interpreter)));
 }

lldb/source/Commands/Options.td

@@ -451,12 +451,6 @@ let Command = "reproducer dump" in {
     "provided, that reproducer is dumped.">;
 }
 
-let Command = "reproducer verify" in {
-  def reproducer_verify_file : Option<"file", "f">, Group<1>, Arg<"Filename">,
-    Desc<"The reproducer path. If a reproducer is replayed and no path is "
-    "provided, that reproducer is dumped.">;
-}
-
 let Command = "reproducer xcrash" in {
   def reproducer_signal : Option<"signal", "s">, Group<1>,
     EnumArg<"None", "ReproducerSignalType()">,