aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEbuka Ezike <yerimyah1@gmail.com>2025-03-21 12:53:58 +0000
committerGitHub <noreply@github.com>2025-03-21 12:53:58 +0000
commit21eeef598376abdf6cd2af6e674948a80eacb8ef (patch)
tree34f73e2d8767d364953d33f2bd014028a51dc809
parent281028e37ca6c97c62ba68cd43eda2ff95bc70c4 (diff)
downloadllvm-revert-131683-show-sbdebugger-setting-for-filepath.zip
llvm-revert-131683-show-sbdebugger-setting-for-filepath.tar.gz
llvm-revert-131683-show-sbdebugger-setting-for-filepath.tar.bz2
Revert "[lldb] Show target.debug-file-search-paths setting from python SBDeb…"revert-131683-show-sbdebugger-setting-for-filepath
This reverts commit 4b419840c883b0de03ae72c7d352c37f24c1932c.
-rw-r--r--lldb/include/lldb/Interpreter/OptionValueFileSpecList.h2
-rw-r--r--lldb/include/lldb/Utility/FileSpec.h11
-rw-r--r--lldb/source/Interpreter/OptionValueFileSpecList.cpp9
-rw-r--r--lldb/source/Utility/FileSpec.cpp7
-rw-r--r--lldb/test/API/commands/settings/TestSettings.py7
5 files changed, 0 insertions, 36 deletions
diff --git a/lldb/include/lldb/Interpreter/OptionValueFileSpecList.h b/lldb/include/lldb/Interpreter/OptionValueFileSpecList.h
index 200ce70..bda6b50 100644
--- a/lldb/include/lldb/Interpreter/OptionValueFileSpecList.h
+++ b/lldb/include/lldb/Interpreter/OptionValueFileSpecList.h
@@ -33,8 +33,6 @@ public:
void DumpValue(const ExecutionContext *exe_ctx, Stream &strm,
uint32_t dump_mask) override;
- llvm::json::Value ToJSON(const ExecutionContext *exe_ctx) override;
-
Status
SetValueFromString(llvm::StringRef value,
VarSetOperationType op = eVarSetOperationAssign) override;
diff --git a/lldb/include/lldb/Utility/FileSpec.h b/lldb/include/lldb/Utility/FileSpec.h
index 3fa89b1d..2e867b2 100644
--- a/lldb/include/lldb/Utility/FileSpec.h
+++ b/lldb/include/lldb/Utility/FileSpec.h
@@ -18,7 +18,6 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/JSON.h"
#include "llvm/Support/Path.h"
#include <cstddef>
@@ -215,16 +214,6 @@ public:
/// The stream to which to dump the object description.
void Dump(llvm::raw_ostream &s) const;
- /// Convert the filespec object to a json value.
- ///
- /// Convert the filespec object to a json value. If the object contains a
- /// valid directory name, it will be displayed followed by a directory
- /// delimiter, and the filename.
- ///
- /// \return
- /// A json value representation of a filespec.
- llvm::json::Value ToJSON() const;
-
Style GetPathStyle() const;
/// Directory string const get accessor.
diff --git a/lldb/source/Interpreter/OptionValueFileSpecList.cpp b/lldb/source/Interpreter/OptionValueFileSpecList.cpp
index 84607eb..98f4938 100644
--- a/lldb/source/Interpreter/OptionValueFileSpecList.cpp
+++ b/lldb/source/Interpreter/OptionValueFileSpecList.cpp
@@ -41,15 +41,6 @@ void OptionValueFileSpecList::DumpValue(const ExecutionContext *exe_ctx,
}
}
-llvm::json::Value
-OptionValueFileSpecList::ToJSON(const ExecutionContext *exe_ctx) {
- std::lock_guard<std::recursive_mutex> lock(m_mutex);
- llvm::json::Array array;
- for (const auto &file_spec : m_current_value)
- array.emplace_back(file_spec.ToJSON());
- return array;
-}
-
Status OptionValueFileSpecList::SetValueFromString(llvm::StringRef value,
VarSetOperationType op) {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
diff --git a/lldb/source/Utility/FileSpec.cpp b/lldb/source/Utility/FileSpec.cpp
index bb2b864..4bebbc9 100644
--- a/lldb/source/Utility/FileSpec.cpp
+++ b/lldb/source/Utility/FileSpec.cpp
@@ -330,13 +330,6 @@ void FileSpec::Dump(llvm::raw_ostream &s) const {
s << path_separator;
}
-llvm::json::Value FileSpec::ToJSON() const {
- std::string str;
- llvm::raw_string_ostream stream(str);
- this->Dump(stream);
- return llvm::json::Value(std::move(str));
-}
-
FileSpec::Style FileSpec::GetPathStyle() const { return m_style; }
void FileSpec::SetDirectory(ConstString directory) {
diff --git a/lldb/test/API/commands/settings/TestSettings.py b/lldb/test/API/commands/settings/TestSettings.py
index 6b89ff7..d36e088 100644
--- a/lldb/test/API/commands/settings/TestSettings.py
+++ b/lldb/test/API/commands/settings/TestSettings.py
@@ -1016,13 +1016,6 @@ class SettingsCommandTestCase(TestBase):
settings_json = self.get_setting_json(setting_path)
self.assertEqual(settings_json, setting_value)
- # Test OptionValueFileSpec and OptionValueFileSpecList
- setting_path = "target.debug-file-search-paths"
- setting_value = ["/tmp" "/tmp2"]
- self.runCmd("settings set %s %s" % (setting_path, " ".join(setting_value)))
- settings_json = self.get_setting_json(setting_path)
- self.assertEqual(settings_json, setting_value)
-
# Test OptionValueFormatEntity
setting_value = """thread #${thread.index}{, name = \\'${thread.name}\\
'}{, queue = ${ansi.fg.green}\\'${thread.queue}\\'${ansi.normal}}{,