From 95f7112be8daa521e607fb3c231012a6d5eafa96 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 1 Jan 2022 11:15:14 -0800 Subject: 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' --- lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp') 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 { -- cgit v1.2.3