Author: Jonas Devlieghere Date: 2024-10-10T09:56:31-07:00 New Revision: f2c5aa920054fa60372a161520e6ea8e8d23880d
URL: https://github.com/llvm/llvm-project/commit/f2c5aa920054fa60372a161520e6ea8e8d23880d DIFF: https://github.com/llvm/llvm-project/commit/f2c5aa920054fa60372a161520e6ea8e8d23880d.diff LOG: [lldb] Fix a variety of LLDB_LOG format strings LLVM now triggers an assertion when the format string and arguments don't match. Fix a variety of incorrect format strings I discovered when enabling logging with a debug build. Added: Modified: lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp lldb/source/Target/ScriptedThreadPlan.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp index f994d025043352..5edaa9e4e053cc 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp @@ -934,7 +934,7 @@ void ClangExpressionDeclMap::LookUpLldbObjCClass(NameSearchContext &context) { QualType(interface_type, 0).getAsOpaquePtr(), function_decl_ctx.GetTypeSystem()->weak_from_this()); - LLDB_LOG(log, " FEVD[{0}] Adding type for $__lldb_objc_class: {1}", + LLDB_LOG(log, " FEVD Adding type for $__lldb_objc_class: {0}", ClangUtil::ToString(interface_type)); AddOneType(context, class_user_type); @@ -974,7 +974,7 @@ void ClangExpressionDeclMap::LookUpLldbObjCClass(NameSearchContext &context) { if (!self_clang_type) return; - LLDB_LOG(log, " FEVD[{0}] Adding type for $__lldb_objc_class: {1}", + LLDB_LOG(log, " FEVD Adding type for $__lldb_objc_class: {0}", ClangUtil::ToString(self_type->GetFullCompilerType())); TypeFromUser class_user_type(self_clang_type); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp index f3a008ff1e8932..96a259b811b5e7 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp @@ -605,7 +605,7 @@ uint32_t AppleObjCDeclVendor::FindDecls(ConstString name, bool append, if (log) { clang::QualType new_iface_type = ast_ctx.getObjCInterfaceType(iface_decl); - LLDB_LOG(log, "AOCTV::FT Created {1} (isa 0x{2:x})", + LLDB_LOG(log, "AOCTV::FT Created {0} (isa 0x{1:x})", new_iface_type.getAsString(), (uint64_t)isa); } diff --git a/lldb/source/Target/ScriptedThreadPlan.cpp b/lldb/source/Target/ScriptedThreadPlan.cpp index a8432f12258ee4..c4bdc8d080e350 100644 --- a/lldb/source/Target/ScriptedThreadPlan.cpp +++ b/lldb/source/Target/ScriptedThreadPlan.cpp @@ -184,8 +184,9 @@ void ScriptedThreadPlan::GetDescription(Stream *s, lldb::StreamSP stream = std::make_shared<lldb_private::StreamString>(); llvm::Error err = m_interface->GetStopDescription(stream); if (err) { - LLDB_LOG_ERROR(GetLog(LLDBLog::Thread), std::move(err), - "Can't call ScriptedThreadPlan::GetStopDescription."); + LLDB_LOG_ERROR( + GetLog(LLDBLog::Thread), std::move(err), + "Can't call ScriptedThreadPlan::GetStopDescription: {0}"); s->Printf("Scripted thread plan implemented by class %s.", m_class_name.c_str()); } else _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
