Merge pull request #7784 from augusto2112/fix-lldb-log

[lldb] Fix LLDB_LOG with format specifier argument

Author: augusto2112

lldb/source/Plugins/ExpressionParser/Swift/SwiftUserExpression.cpp

@@ -667,7 +667,7 @@ bool SwiftUserExpression::Parse(DiagnosticManager &diagnostic_manager,
 
   auto error = [&](const char *error_msg, const char *detail = nullptr) {
     if (detail)
-      LLDB_LOG(log, "%s: %s", error_msg, detail);
+      LLDB_LOG(log, "{0}: {1}", error_msg, detail);
     else
       LLDB_LOG(log, error_msg);
 

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -663,7 +663,7 @@ SwiftLanguageRuntimeImpl::GetNumChildren(CompilerType type,
     if (auto *rti =
             llvm::dyn_cast_or_null<swift::reflection::RecordTypeInfo>(cti)) {
       LLDB_LOG(GetLog(LLDBLog::Types),
-               "%s: class RecordTypeInfo(num_fields=%i)",
+               "{0}: class RecordTypeInfo(num_fields=%i)",
                type.GetMangledTypeName().GetCString(), rti->getNumFields());
 
       // The superclass, if any, is an extra child.
@@ -675,7 +675,7 @@ SwiftLanguageRuntimeImpl::GetNumChildren(CompilerType type,
     return {};
   }
   // FIXME: Implement more cases.
-  LLDB_LOG(GetLog(LLDBLog::Types), "%s: unimplemented type info",
+  LLDB_LOG(GetLog(LLDBLog::Types), "{0}: unimplemented type info",
            type.GetMangledTypeName().GetCString());
   return {};
 }

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -590,7 +590,7 @@ TypeSystemSwiftTypeRef::ResolveTypeAlias(swift::Demangle::Demangler &dem,
   }
   NodePointer n = GetDemangledType(dem, desugared_name.GetStringRef());
   if (!n) {
-    LLDB_LOG(GetLog(LLDBLog::Types), "Unrecognized demangling %s",
+    LLDB_LOG(GetLog(LLDBLog::Types), "Unrecognized demangling {0}",
              desugared_name.AsCString());
     return {{}, {}};
   }