Skip to content

[lldb] Use Python Bytes instead of Buffer for Binary I/O (NFC) #152031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2025
Merged

[lldb] Use Python Bytes instead of Buffer for Binary I/O (NFC) #152031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54de8da
[lldb] Use Python Bytes instead of Buffer for Binary I/O (NFC)
JDevlieghere Aug 4, 2025
8775809
Return PythonException
JDevlieghere Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 6 additions & 40 deletions lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,40 +1085,6 @@ class SimplePythonFile : public OwnedPythonFile<NativeFile> {
char SimplePythonFile::ID = 0;
} // namespace

namespace {
class PythonBuffer {
public:
PythonBuffer &operator=(const PythonBuffer &) = delete;
PythonBuffer(const PythonBuffer &) = delete;

static Expected<PythonBuffer> Create(PythonObject &obj,
int flags = PyBUF_SIMPLE) {
Py_buffer py_buffer = {};
PyObject_GetBuffer(obj.get(), &py_buffer, flags);
if (!py_buffer.obj)
return llvm::make_error<PythonException>();
return PythonBuffer(py_buffer);
}

PythonBuffer(PythonBuffer &&other) {
m_buffer = other.m_buffer;
other.m_buffer.obj = nullptr;
}

~PythonBuffer() {
if (m_buffer.obj)
PyBuffer_Release(&m_buffer);
}

Py_buffer &get() { return m_buffer; }

private:
// takes ownership of the buffer.
PythonBuffer(const Py_buffer &py_buffer) : m_buffer(py_buffer) {}
Py_buffer m_buffer;
};
} // namespace

// Shared methods between TextPythonFile and BinaryPythonFile
namespace {
class PythonIOFile : public OwnedPythonFile<File> {
Expand Down Expand Up @@ -1212,12 +1178,12 @@ class BinaryPythonFile : public PythonIOFile {
num_bytes = 0;
return Status();
}
auto pybuffer = PythonBuffer::Create(pybuffer_obj.get());
if (!pybuffer)
// Cloning since the wrapped exception may still reference the PyThread.
return Status::FromError(pybuffer.takeError()).Clone();
memcpy(buf, pybuffer.get().get().buf, pybuffer.get().get().len);
num_bytes = pybuffer.get().get().len;
PythonBytes pybytes(PyRefType::Borrowed, pybuffer_obj->get());
if (!pybytes)
return Status::FromError(llvm::make_error<PythonException>());
llvm::ArrayRef<uint8_t> bytes = pybytes.GetBytes();
memcpy(buf, bytes.begin(), bytes.size());
num_bytes = bytes.size();
return Status();
}
};
Expand Down
Loading