Author: Raphael Isemann Date: 2020-03-05T14:13:09-08:00 New Revision: d0e8abc4381b3a656cde07a7844628535b8d864c
URL: https://github.com/llvm/llvm-project/commit/d0e8abc4381b3a656cde07a7844628535b8d864c DIFF: https://github.com/llvm/llvm-project/commit/d0e8abc4381b3a656cde07a7844628535b8d864c.diff LOG: [lldb] Fix more typos in log statements in ClangASTSource The indexes need to start at 0 but in D74951 I removed the first parameter and didn't decrement all the indexes. This patch at least makes sure that LLDB logging no longer crashes (but it still deadlocks). Added: Modified: lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp index 0b94b8d4b25c..da25fa3ebcb5 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp @@ -408,22 +408,22 @@ void ClangASTSource::FindExternalLexicalDecls( if (log) { if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context_decl)) LLDB_LOG(log, - "FindExternalLexicalDecls on (ASTContext*){1} '{2}' in " - "'{3}' (%sDecl*){4}", + "FindExternalLexicalDecls on (ASTContext*){0} '{1}' in " + "'{2}' (%sDecl*){3}", m_ast_context, m_clang_ast_context->getDisplayName(), context_named_decl->getNameAsString().c_str(), context_decl->getDeclKindName(), static_cast<const void *>(context_decl)); else if (context_decl) LLDB_LOG(log, - "FindExternalLexicalDecls on (ASTContext*){1} '{2}' in " - "({3}Decl*){4}", + "FindExternalLexicalDecls on (ASTContext*){0} '{1}' in " + "({2}Decl*){3}", m_ast_context, m_clang_ast_context->getDisplayName(), context_decl->getDeclKindName(), static_cast<const void *>(context_decl)); else LLDB_LOG(log, - "FindExternalLexicalDecls on (ASTContext*){1} '{2}' in a " + "FindExternalLexicalDecls on (ASTContext*){0} '{1}' in a " "NULL context", m_ast_context, m_clang_ast_context->getDisplayName()); } @@ -433,7 +433,7 @@ void ClangASTSource::FindExternalLexicalDecls( if (!original.Valid()) return; - LLDB_LOG(log, " FELD Original decl {1} (Decl*){2:x}:\n{3}", + LLDB_LOG(log, " FELD Original decl {0} (Decl*){1:x}:\n{2}", static_cast<void *>(original.ctx), static_cast<void *>(original.decl), ClangUtil::DumpDecl(original.decl)); @@ -558,7 +558,7 @@ void ClangASTSource::FindExternalVisibleDecls(NameSearchContext &context) { if (!context.m_namespace_map->empty()) { if (log && log->GetVerbose()) - LLDB_LOG(log, " CAS::FEVD Registering namespace map {1} ({2} entries)", + LLDB_LOG(log, " CAS::FEVD Registering namespace map {0} ({1} entries)", context.m_namespace_map.get(), context.m_namespace_map->size()); NamespaceDecl *clang_namespace_decl = _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
