caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uint32_t options -> File::OpenOptions options

Browse Source 
Summary:
This patch re-types everywhere that passes a File::OpenOptions
as a uint32_t so it actually uses File::OpenOptions.

It also converts some OpenOptions related functions that fail
by returning 0 or NULL into llvm::Expected

split off from https://reviews.llvm.org/D68737

Reviewers: JDevlieghere, jasonmolenda, labath

Reviewed By: labath

Subscribers: lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D68853

llvm-svn: 374817
This commit is contained in:
Lawrence D'Anna
2019-10-14 20:15:34 +00:00
parent 322f12afc3
commit 62c9fe4273
24 changed files with 109 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
View File

@@ -1090,8 +1090,12 @@ FileUP PythonFile::GetUnderlyingFile() const {
// File object knows about that.
PythonString py_mode = GetAttributeValue("mode").AsType<PythonString>();
auto options = File::GetOptionsFromMode(py_mode.GetString());
auto file = std::unique_ptr<File>(
new NativeFile(PyObject_AsFileDescriptor(m_py_obj), options, false));
if (!options) {
llvm::consumeError(options.takeError());
return nullptr;
}
auto file = std::unique_ptr<File>(new NativeFile(
PyObject_AsFileDescriptor(m_py_obj), options.get(), false));
if (!file->IsValid())
return nullptr;
return file;
@@ -1165,9 +1169,10 @@ std::error_code PythonException::convertToErrorCode() const {
char PythonException::ID = 0;
llvm::Expected<uint32_t> GetOptionsForPyObject(const PythonObject &obj) {
uint32_t options = 0;
llvm::Expected<File::OpenOptions>
GetOptionsForPyObject(const PythonObject &obj) {
#if PY_MAJOR_VERSION >= 3
auto options = File::OpenOptions(0);
auto readable = As<bool>(obj.CallMethod("readable"));
if (!readable)
return readable.takeError();
@@ -1178,11 +1183,11 @@ llvm::Expected<uint32_t> GetOptionsForPyObject(const PythonObject &obj) {
options |= File::eOpenOptionRead;
if (writable.get())
options |= File::eOpenOptionWrite;
return options;
#else
PythonString py_mode = obj.GetAttributeValue("mode").AsType<PythonString>();
options = File::GetOptionsFromMode(py_mode.GetString());
return File::GetOptionsFromMode(py_mode.GetString());
#endif
return options;
}
// Base class template for python files. All it knows how to do
@@ -1245,7 +1250,7 @@ namespace {
class SimplePythonFile : public OwnedPythonFile<NativeFile> {
public:
SimplePythonFile(const PythonFile &file, bool borrowed, int fd,
uint32_t options)
File::OpenOptions options)
: OwnedPythonFile(file, borrowed, fd, options, false) {}
};
} // namespace