Skip to content

Commit

Permalink
Fix about a dozen compile warnings
Browse files Browse the repository at this point in the history
Summary:
It fixes the following compile warnings:
1. '0' flag ignored with precision and ‘%d’ gnu_printf format
2. enumeral and non-enumeral type in conditional expression
3. format ‘%d’ expects argument of type ‘int’, but argument 4 has type ...
4. enumeration value ‘...’ not handled in switch
5. cast from type ‘const uint64_t* {aka ...}’ to type ‘int64_t* {aka ...}’ casts away qualifiers
6. extra ‘;’
7. comparison between signed and unsigned integer expressions
8. variable ‘register_operand’ set but not used
9. control reaches end of non-void function

Reviewers: jingham, emaste, zturner, clayborg

Subscribers: lldb-commits

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

llvm-svn: 281191
  • Loading branch information
k15tfu committed Sep 12, 2016
1 parent cf6aaa9 commit 4f730dc
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion lldb/source/Core/Log.cpp
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
Expand Up @@ -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);
Expand Down
17 changes: 8 additions & 9 deletions lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
Expand Up @@ -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));
Expand Down
Expand Up @@ -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;
}
Expand Down
2 changes: 2 additions & 0 deletions lldb/source/Plugins/Process/minidump/MinidumpParser.cpp
Expand Up @@ -138,6 +138,8 @@ ArchSpec MinidumpParser::GetArchitecture() {
case MinidumpCPUArchitecture::ARM64:
arch_spec.GetTriple().setArch(llvm::Triple::ArchType::aarch64);
break;
default:
break;
}

return arch_spec;
Expand Down
Expand Up @@ -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;
}
Expand Down
11 changes: 6 additions & 5 deletions lldb/source/Target/StackFrame.cpp
Expand Up @@ -1278,6 +1278,8 @@ GetBaseExplainingValue(const Instruction::Operand &operand,
return std::make_pair(nullptr, 0);
}
}
default:
return std::make_pair(nullptr, 0);
}
}

Expand All @@ -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();
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 4f730dc

Please sign in to comment.