diff options
| author | Kazu Hirata <kazu@google.com> | 2022-01-01 11:15:14 -0800 |
|---|---|---|
| committer | Kazu Hirata <kazu@google.com> | 2022-01-01 11:15:14 -0800 |
| commit | 95f7112be8daa521e607fb3c231012a6d5eafa96 (patch) | |
| tree | 944651d50a331cfa4c4c475e46496fc0eb202077 /lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | |
| parent | 913457acf07be7f22d71ac41ad1076517d7f45c6 (diff) | |
| download | llvm-95f7112be8daa521e607fb3c231012a6d5eafa96.tar.gz llvm-95f7112be8daa521e607fb3c231012a6d5eafa96.tar.bz2 llvm-95f7112be8daa521e607fb3c231012a6d5eafa96.zip | |
Revert "[lldb] Use nullptr instead of 0 or NULL (NFC)"
This reverts commit 913457acf07be7f22d71ac41ad1076517d7f45c6.
It again broke builds on Windows:
lldb/source/Host/common/HostNativeThreadBase.cpp(37,14): error:
assigning to 'lldb::thread_result_t' (aka 'unsigned int') from
incompatible type 'std::nullptr_t'
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp')
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 30d7d239834b..e72d55dd2aba 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -768,9 +768,9 @@ public: // Write out the EXC registers data.PutHex32(EXCRegSet); data.PutHex32(EXCWordCount); - PrintRegisterValue(reg_ctx, "far", nullptr, 8, data); - PrintRegisterValue(reg_ctx, "esr", nullptr, 4, data); - PrintRegisterValue(reg_ctx, "exception", nullptr, 4, data); + PrintRegisterValue(reg_ctx, "far", NULL, 8, data); + PrintRegisterValue(reg_ctx, "esr", NULL, 4, data); + PrintRegisterValue(reg_ctx, "exception", NULL, 4, data); return true; } return false; @@ -5073,7 +5073,7 @@ void ObjectFileMachO::GetAllArchSpecs(const llvm::MachO::mach_header &header, lldb::offset_t offset = lc_offset; for (uint32_t i = 0; i < header.ncmds; ++i) { const lldb::offset_t cmd_offset = offset; - if (data.GetU32(&offset, &load_cmd, 2) == nullptr) + if (data.GetU32(&offset, &load_cmd, 2) == NULL) break; llvm::MachO::version_min_command version_min; @@ -5123,7 +5123,7 @@ void ObjectFileMachO::GetAllArchSpecs(const llvm::MachO::mach_header &header, offset = lc_offset; for (uint32_t i = 0; i < header.ncmds; ++i) { const lldb::offset_t cmd_offset = offset; - if (data.GetU32(&offset, &load_cmd, 2) == nullptr) + if (data.GetU32(&offset, &load_cmd, 2) == NULL) break; do { |