diff options
4 files changed, 9 insertions, 9 deletions
diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp index 078825797dc..e747f5b56f0 100644 --- a/lldb/source/Expression/ClangExpressionDeclMap.cpp +++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp @@ -2307,7 +2307,7 @@ ClangExpressionDeclMap::DoMaterializeOneVariable { if (value_byte_size != value_data_extractor.GetByteSize()) { - err.SetErrorStringWithFormat ("Size mismatch for %s: %llu versus %llu", + err.SetErrorStringWithFormat ("Size mismatch for %s: %" PRIu64 " versus %" PRIu64, name.GetCString(), (uint64_t)value_data_extractor.GetByteSize(), (uint64_t)value_byte_size); diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 440d52618dd..f4192b18f4a 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -386,7 +386,7 @@ DisassemblerLLVMC::LLVMCDisassembler::LLVMCDisassembler (const char *triple, uns if (m_instr_info_ap.get() == NULL || m_reg_info_ap.get() == NULL || m_subtarget_info_ap.get() == NULL || m_asm_info_ap.get() == NULL) { - m_is_valid = NULL; + m_is_valid = false; return; } diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 2e865c1847b..7735c766537 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -930,7 +930,7 @@ DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule (Process *p addr_t file_address = kernel_object_file->GetHeaderAddress().GetFileAddress(); if (m_load_address != LLDB_INVALID_ADDRESS && file_address != LLDB_INVALID_ADDRESS) { - s->Printf ("Kernel slid 0x%llx in memory.\n", m_load_address - file_address); + s->Printf ("Kernel slid 0x%" PRIx64 " in memory.\n", m_load_address - file_address); } } if (m_module_sp->GetFileSpec().GetDirectory().IsEmpty()) diff --git a/lldb/source/Symbol/ClangASTImporter.cpp b/lldb/source/Symbol/ClangASTImporter.cpp index 25dfbef9010..2c7de739145 100644 --- a/lldb/source/Symbol/ClangASTImporter.cpp +++ b/lldb/source/Symbol/ClangASTImporter.cpp @@ -26,12 +26,12 @@ ClangASTMetrics::Counters ClangASTMetrics::local_counters = { 0, 0, 0, 0, 0, 0 } void ClangASTMetrics::DumpCounters (lldb::LogSP log, ClangASTMetrics::Counters &counters) { - log->Printf(" Number of visible Decl queries by name : %llu", counters.m_visible_query_count); - log->Printf(" Number of lexical Decl queries : %llu", counters.m_lexical_query_count); - log->Printf(" Number of imports initiated by LLDB : %llu", counters.m_lldb_import_count); - log->Printf(" Number of imports conducted by Clang : %llu", counters.m_clang_import_count); - log->Printf(" Number of Decls completed : %llu", counters.m_decls_completed_count); - log->Printf(" Number of records laid out : %llu", counters.m_record_layout_count); + log->Printf(" Number of visible Decl queries by name : %" PRIu64, counters.m_visible_query_count); + log->Printf(" Number of lexical Decl queries : %" PRIu64, counters.m_lexical_query_count); + log->Printf(" Number of imports initiated by LLDB : %" PRIu64, counters.m_lldb_import_count); + log->Printf(" Number of imports conducted by Clang : %" PRIu64, counters.m_clang_import_count); + log->Printf(" Number of Decls completed : %" PRIu64, counters.m_decls_completed_count); + log->Printf(" Number of records laid out : %" PRIu64, counters.m_record_layout_count); } void ClangASTMetrics::DumpCounters (lldb::LogSP log) |
