diff options
Diffstat (limited to 'lldb')
8 files changed, 25 insertions, 23 deletions
diff --git a/lldb/source/Core/Log.cpp b/lldb/source/Core/Log.cpp index a3d559c7920..cac334367ce 100644 --- a/lldb/source/Core/Log.cpp +++ b/lldb/source/Core/Log.cpp @@ -82,7 +82,7 @@ void Log::VAPrintf(const char *format, va_list args) { // Timestamp if requested if (m_options.Test(LLDB_LOG_OPTION_PREPEND_TIMESTAMP)) { TimeValue now = TimeValue::Now(); - header.Printf("%9d.%09.9d ", now.seconds(), now.nanoseconds()); + header.Printf("%9d.%9.9d ", now.seconds(), now.nanoseconds()); } // Add the process and thread if requested diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 42e6dbc7f90..4f187156df1 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -1938,9 +1938,9 @@ void ObjectFileELF::CreateSections(SectionList &unified_section_list) { sect_type = eSectionTypeGoSymtab; const uint32_t permissions = - ((header.sh_flags & SHF_ALLOC) ? ePermissionsReadable : 0) | - ((header.sh_flags & SHF_WRITE) ? ePermissionsWritable : 0) | - ((header.sh_flags & SHF_EXECINSTR) ? ePermissionsExecutable : 0); + ((header.sh_flags & SHF_ALLOC) ? ePermissionsReadable : 0u) | + ((header.sh_flags & SHF_WRITE) ? ePermissionsWritable : 0u) | + ((header.sh_flags & SHF_EXECINSTR) ? ePermissionsExecutable : 0u); switch (header.sh_type) { case SHT_SYMTAB: assert(sect_type == eSectionTypeOther); diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 69ff3512ce3..d24380375f5 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -1458,13 +1458,13 @@ void ObjectFileMachO::CreateSections(SectionList &unified_section_list) { } } if (m_data.GetU32(&offset, &load_cmd.maxprot, 4)) { - const uint32_t segment_permissions = - ((load_cmd.initprot & VM_PROT_READ) ? ePermissionsReadable - : 0) | - ((load_cmd.initprot & VM_PROT_WRITE) ? ePermissionsWritable - : 0) | - ((load_cmd.initprot & VM_PROT_EXECUTE) ? ePermissionsExecutable - : 0); + uint32_t segment_permissions = 0; + if (load_cmd.initprot & VM_PROT_READ) + segment_permissions |= ePermissionsReadable; + if (load_cmd.initprot & VM_PROT_WRITE) + segment_permissions |= ePermissionsWritable; + if (load_cmd.initprot & VM_PROT_EXECUTE) + segment_permissions |= ePermissionsExecutable; const bool segment_is_encrypted = (load_cmd.flags & SG_PROTECTED_VERSION_1) != 0; @@ -2621,8 +2621,7 @@ size_t ObjectFileMachO::ParseSymtab() { "/System/Library/Caches/com.apple.dyld/", /* IPHONE_DYLD_SHARED_CACHE_DIR */ "dyld_shared_cache_", /* DYLD_SHARED_CACHE_BASE_NAME */ - header_arch.GetArchitectureName(), - ".development"); + header_arch.GetArchitectureName(), ".development"); FileSpec dsc_nondevelopment_filespec(dsc_path, false); FileSpec dsc_development_filespec(dsc_path_development, false); diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp index aa985484c18..840a79279f5 100644 --- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp +++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp @@ -139,9 +139,9 @@ lldb::addr_t ProcessElfCore::AddAddressRangeFromLoadSegment( // Keep a separate map of permissions that that isn't coalesced so all ranges // are maintained. const uint32_t permissions = - ((header->p_flags & llvm::ELF::PF_R) ? lldb::ePermissionsReadable : 0) | - ((header->p_flags & llvm::ELF::PF_W) ? lldb::ePermissionsWritable : 0) | - ((header->p_flags & llvm::ELF::PF_X) ? lldb::ePermissionsExecutable : 0); + ((header->p_flags & llvm::ELF::PF_R) ? lldb::ePermissionsReadable : 0u) | + ((header->p_flags & llvm::ELF::PF_W) ? lldb::ePermissionsWritable : 0u) | + ((header->p_flags & llvm::ELF::PF_X) ? lldb::ePermissionsExecutable : 0u); m_core_range_infos.Append( VMRangeToPermissions::Entry(addr, header->p_memsz, permissions)); diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 68baba2494b..e554fafa00c 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -3653,7 +3653,7 @@ Error GDBRemoteCommunicationClient::ConfigureRemoteStructuredData( error.SetErrorStringWithFormat("configuring StructuredData feature %s " "failed when sending packet: " "PacketResult=%d", - type_name.AsCString(), result); + type_name.AsCString(), (int)result); } return error; } diff --git a/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp b/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp index 28dbd1bb5f1..8610922a696 100644 --- a/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp +++ b/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp @@ -138,6 +138,8 @@ ArchSpec MinidumpParser::GetArchitecture() { case MinidumpCPUArchitecture::ARM64: arch_spec.GetTriple().setArch(llvm::Triple::ArchType::aarch64); break; + default: + break; } return arch_spec; diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp index 17028cb4d18..f2f3d5be9ff 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp @@ -518,7 +518,7 @@ int64_t PythonInteger::GetInteger() const { // 0xffffffffffffffff. If we use the unsigned long long // it will work as expected. const uint64_t uval = PyLong_AsUnsignedLongLong(m_py_obj); - result = *((int64_t *)&uval); + result = static_cast<int64_t>(uval); } return result; } diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index 66c672e0772..0b28c1ea20e 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -1278,6 +1278,8 @@ GetBaseExplainingValue(const Instruction::Operand &operand, return std::make_pair(nullptr, 0); } } + default: + return std::make_pair(nullptr, 0); } } @@ -1291,7 +1293,7 @@ GetBaseExplainingDereference(const Instruction::Operand &operand, } return std::make_pair(nullptr, 0); } -}; +} lldb::ValueObjectSP StackFrame::GuessValueForAddress(lldb::addr_t addr) { TargetSP target_sp = CalculateTarget(); @@ -1420,7 +1422,7 @@ ValueObjectSP GetValueForDereferincingOffset(StackFrame &frame, Error error; ValueObjectSP pointee = base->Dereference(error); - if (offset >= pointee->GetByteSize()) { + if (offset >= 0 && uint64_t(offset) >= pointee->GetByteSize()) { int64_t index = offset / pointee->GetByteSize(); offset = offset % pointee->GetByteSize(); const bool can_create = true; @@ -1586,17 +1588,16 @@ lldb::ValueObjectSP DoGuessValueAt(StackFrame &frame, ConstString reg, continue; } - Instruction::Operand *register_operand = nullptr; Instruction::Operand *origin_operand = nullptr; if (operands[0].m_type == Instruction::Operand::Type::Register && operands[0].m_clobbered == true && operands[0].m_register == reg) { - register_operand = &operands[0]; + // operands[0] is a register operand origin_operand = &operands[1]; } else if (operands[1].m_type == Instruction::Operand::Type::Register && operands[1].m_clobbered == true && operands[1].m_register == reg) { - register_operand = &operands[1]; origin_operand = &operands[0]; + // operands[1] is a register operand } else { continue; } |
