reuse LOG_PRINTF_IMPL

Author: kastiglione

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

@@ -170,12 +170,14 @@ std::recursive_mutex g_log_mutex;
 
 /// Similar to LLDB_LOG, but with richer contextual information.
 #define LOG_PRINTF(CHANNEL, FMT, ...)                                          \
-  LOG_PRINTF_IMPL(CHANNEL, false, FMT, ##__VA_ARGS__)
+  LOG_PRINTF_IMPL(lldb_private::GetLogIfAllCategoriesSet(CHANNEL), false, FMT, \
+                  ##__VA_ARGS__)
 #define LOG_VERBOSE_PRINTF(CHANNEL, FMT, ...)                                  \
-  LOG_PRINTF_IMPL(CHANNEL, true, FMT, ##__VA_ARGS__)
+  LOG_PRINTF_IMPL(lldb_private::GetLogIfAllCategoriesSet(CHANNEL), true, FMT,  \
+                  ##__VA_ARGS__)
 #define LOG_PRINTF_IMPL(CHANNEL, VERBOSE, FMT, ...)                            \
   do {                                                                         \
-    if (Log *log = lldb_private::GetLogIfAllCategoriesSet(CHANNEL))            \
+    if (Log *log = CHANNEL)                                                    \
       if (!(VERBOSE) || log->GetVerbose()) {                                   \
         std::lock_guard<std::recursive_mutex> locker(g_log_mutex);             \
         /* The format string is optimized for code size, not speed. */         \
@@ -185,19 +187,9 @@ std::recursive_mutex g_log_mutex;
       }                                                                        \
   } while (0)
 
-#define SWIFT_LOG_PRINTF(FMT, ...)                                             \
-  LOG_PRINTF_IMPL(LIBLLDB_LOG_TYPES, false, FMT, ##__VA_ARGS__);               \
-  SWIFT_LOG_PRINTF_IMPL(FMT, ##__VA_ARGS__)
-#define SWIFT_LOG_PRINTF_IMPL(FMT, ...)                                        \
-  do {                                                                         \
-    if (Log *log = lldb_private::GetSwiftHealthLog()) {                        \
-      std::lock_guard<std::recursive_mutex> locker(g_log_mutex);               \
-      /* The format string is optimized for code size, not speed. */           \
-      log->Printf("%s::%s%s" FMT, m_description.c_str(),                       \
-                  IsLambda(__FUNCTION__) ? "" : __FUNCTION__,                  \
-                  (FMT && FMT[0] == '(') ? "" : "() -- ", ##__VA_ARGS__);      \
-    }                                                                          \
-  } while (0)
+#define HEALTH_LOG_PRINTF(FMT, ...)                                            \
+  LOG_PRINTF(LIBLLDB_LOG_TYPES, FMT, ##__VA_ARGS__);                           \
+  LOG_PRINTF_IMPL(lldb_private::GetSwiftHealthLog(), false, FMT, ##__VA_ARGS__)
 
 using namespace lldb;
 using namespace lldb_private;
@@ -5092,61 +5084,62 @@ void SwiftASTContext::ClearModuleDependentCaches() {
 void SwiftASTContext::LogConfiguration() {
   // It makes no sense to call VALID_OR_RETURN here. We specifically
   // want the logs in the error case!
-  SWIFT_LOG_PRINTF("(SwiftASTContext*)%p:", static_cast<void *>(this));
+  HEALTH_LOG_PRINTF("(SwiftASTContext*)%p:", static_cast<void *>(this));
 
   if (!m_ast_context_ap) {
-    SWIFT_LOG_PRINTF("  (no AST context)");
+    HEALTH_LOG_PRINTF("  (no AST context)");
     return;
   }
 
-  SWIFT_LOG_PRINTF("  Architecture                 : %s",
-                   m_ast_context_ap->LangOpts.Target.getTriple().c_str());
-  SWIFT_LOG_PRINTF("  SDK path                     : %s",
-                   m_ast_context_ap->SearchPathOpts.SDKPath.c_str());
-  SWIFT_LOG_PRINTF(
+  HEALTH_LOG_PRINTF("  Architecture                 : %s",
+                    m_ast_context_ap->LangOpts.Target.getTriple().c_str());
+  HEALTH_LOG_PRINTF("  SDK path                     : %s",
+                    m_ast_context_ap->SearchPathOpts.SDKPath.c_str());
+  HEALTH_LOG_PRINTF(
       "  Runtime resource path        : %s",
       m_ast_context_ap->SearchPathOpts.RuntimeResourcePath.c_str());
-  SWIFT_LOG_PRINTF("  Runtime library paths        : (%llu items)",
-                   (unsigned long long)m_ast_context_ap->SearchPathOpts
-                       .RuntimeLibraryPaths.size());
+  HEALTH_LOG_PRINTF("  Runtime library paths        : (%llu items)",
+                    (unsigned long long)m_ast_context_ap->SearchPathOpts
+                        .RuntimeLibraryPaths.size());
 
   for (const auto &runtime_library_path :
        m_ast_context_ap->SearchPathOpts.RuntimeLibraryPaths) {
-    SWIFT_LOG_PRINTF("    %s", runtime_library_path.c_str());
+    HEALTH_LOG_PRINTF("    %s", runtime_library_path.c_str());
   }
 
-  SWIFT_LOG_PRINTF("  Runtime library import paths : (%llu items)",
-                   (unsigned long long)m_ast_context_ap->SearchPathOpts
-                       .RuntimeLibraryImportPaths.size());
+  HEALTH_LOG_PRINTF("  Runtime library import paths : (%llu items)",
+                    (unsigned long long)m_ast_context_ap->SearchPathOpts
+                        .RuntimeLibraryImportPaths.size());
 
   for (const auto &runtime_import_path :
        m_ast_context_ap->SearchPathOpts.RuntimeLibraryImportPaths) {
-    SWIFT_LOG_PRINTF("    %s", runtime_import_path.c_str());
+    HEALTH_LOG_PRINTF("    %s", runtime_import_path.c_str());
   }
 
-  SWIFT_LOG_PRINTF("  Framework search paths       : (%llu items)",
-                   (unsigned long long)m_ast_context_ap->SearchPathOpts
-                       .FrameworkSearchPaths.size());
+  HEALTH_LOG_PRINTF("  Framework search paths       : (%llu items)",
+                    (unsigned long long)m_ast_context_ap->SearchPathOpts
+                        .FrameworkSearchPaths.size());
   for (const auto &framework_search_path :
        m_ast_context_ap->SearchPathOpts.FrameworkSearchPaths) {
-    SWIFT_LOG_PRINTF("    %s", framework_search_path.Path.c_str());
+    HEALTH_LOG_PRINTF("    %s", framework_search_path.Path.c_str());
   }
 
-  SWIFT_LOG_PRINTF("  Import search paths          : (%llu items)",
-                   (unsigned long long)m_ast_context_ap->SearchPathOpts
-                       .ImportSearchPaths.size());
+  HEALTH_LOG_PRINTF("  Import search paths          : (%llu items)",
+                    (unsigned long long)m_ast_context_ap->SearchPathOpts
+                        .ImportSearchPaths.size());
   for (std::string &import_search_path :
        m_ast_context_ap->SearchPathOpts.ImportSearchPaths) {
-    SWIFT_LOG_PRINTF("    %s", import_search_path.c_str());
+    HEALTH_LOG_PRINTF("    %s", import_search_path.c_str());
   }
 
   swift::ClangImporterOptions &clang_importer_options =
       GetClangImporterOptions();
 
-  SWIFT_LOG_PRINTF("  Extra clang arguments        : (%llu items)",
-                   (unsigned long long)clang_importer_options.ExtraArgs.size());
+  HEALTH_LOG_PRINTF(
+      "  Extra clang arguments        : (%llu items)",
+      (unsigned long long)clang_importer_options.ExtraArgs.size());
   for (std::string &extra_arg : clang_importer_options.ExtraArgs) {
-    SWIFT_LOG_PRINTF("    %s", extra_arg.c_str());
+    HEALTH_LOG_PRINTF("    %s", extra_arg.c_str());
   }
 }