Author: Shafik Yaghmour Date: 2021-02-12T11:09:39-08:00 New Revision: 9f175998debcbb14e95d7e94ca5fee26f4acc63b
URL: https://github.com/llvm/llvm-project/commit/9f175998debcbb14e95d7e94ca5fee26f4acc63b DIFF: https://github.com/llvm/llvm-project/commit/9f175998debcbb14e95d7e94ca5fee26f4acc63b.diff LOG: [LLDB] Fix LLDB_LOG calls to use correct formatting It looks like a previous change switched these from LLDB_LOGF but did not update the format strings. Differential Revision: https://reviews.llvm.org/D96550 Added: Modified: lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp index 0f34c48c7e82..19031af400ea 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp @@ -1570,10 +1570,10 @@ bool ClangASTSource::layoutRecordType(const RecordDecl *record, uint64_t &size, if (log) { LLDB_LOG(log, "LRT returned:"); - LLDB_LOG(log, "LRT Original = (RecordDecl*)%p", + LLDB_LOG(log, "LRT Original = (RecordDecl*){0}", static_cast<const void *>(origin_record.decl)); - LLDB_LOG(log, "LRT Size = %" PRId64, size); - LLDB_LOG(log, "LRT Alignment = %" PRId64, alignment); + LLDB_LOG(log, "LRT Size = {0}", size); + LLDB_LOG(log, "LRT Alignment = {0}", alignment); LLDB_LOG(log, "LRT Fields:"); for (RecordDecl::field_iterator fi = record->field_begin(), fe = record->field_end(); diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp index 852ce3bbd3db..04d72ce4f021 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp @@ -350,7 +350,7 @@ bool ClangExpressionDeclMap::AddValueToStruct(const NamedDecl *decl, if (!var) return false; - LLDB_LOG(log, "Adding value for (NamedDecl*)%p [%s - %s] to the structure", + LLDB_LOG(log, "Adding value for (NamedDecl*){0} [{1} - {2}] to the structure", decl, name, var->GetName()); // We know entity->m_parser_vars is valid because we used a parser variable @@ -752,7 +752,7 @@ void ClangExpressionDeclMap::SearchPersistenDecls(NameSearchContext &context, MaybeRegisterFunctionBody(parser_function_decl); } - LLDB_LOG(log, " CEDM::FEVD Found persistent decl %s", name); + LLDB_LOG(log, " CEDM::FEVD Found persistent decl {0}", name); context.AddNamedDecl(parser_named_decl); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
