Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: llvm/llvm-project
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: llvm/llvm-project
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: revert-131683-show-sbdebugger-setting-for-filepath
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Mar 21, 2025

  1. Revert "[lldb] Show target.debug-file-search-paths setting from pytho…

    …n SBDeb…"
    
    This reverts commit 4b41984.
    da-viper authored Mar 21, 2025
    Copy the full SHA
    21eeef5 View commit details
2 changes: 0 additions & 2 deletions lldb/include/lldb/Interpreter/OptionValueFileSpecList.h
Original file line number Diff line number Diff line change
@@ -33,8 +33,6 @@ class OptionValueFileSpecList
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;
11 changes: 0 additions & 11 deletions lldb/include/lldb/Utility/FileSpec.h
Original file line number Diff line number Diff line change
@@ -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 @@ class FileSpec {
/// 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.
9 changes: 0 additions & 9 deletions lldb/source/Interpreter/OptionValueFileSpecList.cpp
Original file line number Diff line number Diff line change
@@ -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);
7 changes: 0 additions & 7 deletions lldb/source/Utility/FileSpec.cpp
Original file line number Diff line number Diff line change
@@ -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) {
7 changes: 0 additions & 7 deletions lldb/test/API/commands/settings/TestSettings.py
Original file line number Diff line number Diff line change
@@ -1016,13 +1016,6 @@ def test_settings_api(self):
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}}{,