ki.stfu updated this revision to Diff 70656.
ki.stfu marked 3 inline comments as done.
ki.stfu added a comment.
Fixes per Zachary's comments
https://reviews.llvm.org/D24331
Files:
source/Core/Log.cpp
source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
source/Plugins/Process/elf-core/ProcessElfCore.cpp
source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
source/Plugins/Process/minidump/MinidumpParser.cpp
source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
source/Target/StackFrame.cpp
Index: source/Target/StackFrame.cpp
===================================================================
--- source/Target/StackFrame.cpp
+++ source/Target/StackFrame.cpp
@@ -853,10 +853,9 @@
} else {
ValueObjectSP synthetic = valobj_sp->GetSyntheticValue();
if (no_synth_child /* synthetic is forbidden */ ||
- !synthetic /* no synthetic */
- ||
- synthetic == valobj_sp) /* synthetic is the same as the
- original object */
+ !synthetic /* no synthetic */
+ || synthetic == valobj_sp) /* synthetic is the same as the
+ original object */
{
valobj_sp->GetExpressionPath(var_expr_path_strm, false);
error.SetErrorStringWithFormat(
@@ -1279,6 +1278,8 @@
return std::make_pair(nullptr, 0);
}
}
+ default:
+ return std::make_pair(nullptr, 0);
}
}
@@ -1292,7 +1293,7 @@
}
return std::make_pair(nullptr, 0);
}
-};
+}
lldb::ValueObjectSP StackFrame::GuessValueForAddress(lldb::addr_t addr) {
TargetSP target_sp = CalculateTarget();
@@ -1421,7 +1422,7 @@
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;
@@ -1587,17 +1588,16 @@
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;
}
Index: source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
===================================================================
--- source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
+++ source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
@@ -518,7 +518,7 @@
// 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;
}
Index: source/Plugins/Process/minidump/MinidumpParser.cpp
===================================================================
--- source/Plugins/Process/minidump/MinidumpParser.cpp
+++ source/Plugins/Process/minidump/MinidumpParser.cpp
@@ -138,6 +138,8 @@
case MinidumpCPUArchitecture::ARM64:
arch_spec.GetTriple().setArch(llvm::Triple::ArchType::aarch64);
break;
+ default:
+ break;
}
return arch_spec;
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -3567,7 +3567,7 @@
error.SetErrorStringWithFormat("configuring StructuredData feature %s "
"failed when sending packet: "
"PacketResult=%d",
- type_name.AsCString(), result);
+ type_name.AsCString(), (int)result);
}
return error;
}
Index: source/Plugins/Process/elf-core/ProcessElfCore.cpp
===================================================================
--- source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -139,9 +139,9 @@
// 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));
Index: source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
===================================================================
--- source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -1458,13 +1458,13 @@
}
}
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 @@
"/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);
Index: source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
===================================================================
--- source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -1938,9 +1938,9 @@
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);
Index: source/Core/Log.cpp
===================================================================
--- source/Core/Log.cpp
+++ source/Core/Log.cpp
@@ -82,7 +82,7 @@
// 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
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
