Merge commit 'd64c6cffd7c5' from swift/release/6.1 into stable/20240723

Author: git apple-llvm automerger

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

@@ -892,10 +892,10 @@ bool SwiftLanguageRuntimeImpl::AddModuleToReflectionContext(
     return false;
   }
   bool found = HasReflectionInfo(obj_file);
-  LLDB_LOG(GetLog(LLDBLog::Types), "{0} reflection metadata in \"{1}\"",
-           found ? "Adding" : "No",
-           module_sp->GetObjectName() ? module_sp->GetObjectName()
-                                      : obj_file->GetFileSpec().GetFilename());
+  LLDB_LOGV(GetLog(LLDBLog::Types), "{0} reflection metadata in \"{1}\"",
+            found ? "Adding" : "No",
+            module_sp->GetObjectName() ? module_sp->GetObjectName()
+                                       : obj_file->GetFileSpec().GetFilename());
   if (!found)
     return true;
 

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

@@ -3109,9 +3109,9 @@ SwiftASTContext::CreateInstance(const SymbolContext &sc,
         swift_ast_sp->RegisterSectionModules(*cur_module_sp, module_names);
         if (GetLog(LLDBLog::Types)) {
           std::string spacer(indent, '-');
-          LOG_PRINTF(GetLog(LLDBLog::Types), "+%s Dependency scan: %s",
-                     spacer.c_str(),
-                     cur_module_sp->GetSpecificationDescription().c_str());
+          LOG_VERBOSE_PRINTF(
+              GetLog(LLDBLog::Types), "+%s Dependency scan: %s", spacer.c_str(),
+              cur_module_sp->GetSpecificationDescription().c_str());
         }
         if (auto object = cur_module_sp->GetObjectFile()) {
           FileSpecList file_list;
@@ -3125,9 +3125,9 @@ SwiftASTContext::CreateInstance(const SymbolContext &sc,
             } else {
               if (GetLog(LLDBLog::Types)) {
                 std::string spacer(indent, '-');
-                LOG_PRINTF(GetLog(LLDBLog::Types),
-                           "+%s Could not find %s in images", spacer.c_str(),
-                           fs.GetPath().c_str());
+                LOG_VERBOSE_PRINTF(GetLog(LLDBLog::Types),
+                                   "+%s Could not find %s in images",
+                                   spacer.c_str(), fs.GetPath().c_str());
               }
             }
           }

lldb/test/API/lang/swift/reflection_loading/TestSwiftReflectionLoading.py

@@ -14,8 +14,8 @@ def test(self):
         """Test that reflection metadata is imported"""
         self.build()
 
-        log = self.getBuildArtifact("types.log")
-        self.runCmd('log enable lldb types -f "%s"' % log)
+        types_log = self.getBuildArtifact("types.log")
+        self.runCmd('log enable lldb types -v -f "%s"' % types_log)
 
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
             self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'),
@@ -26,14 +26,6 @@ def test(self):
         lldbutil.check_variable(self, var_c_x, value="23")
 
         # Scan through the types log.
-        import io
-        logfile = io.open(log, "r", encoding='utf-8')
-        found_exe = 0
-        found_lib = 0
-        for line in logfile:
-            if re.search(r'Adding reflection metadata in .*a\.out', line):
-                found_exe += 1
-            if re.search(r'Adding reflection metadata in .*dynamic_lib', line):
-                found_lib += 1
-        self.assertEqual(found_exe, 1)
-        self.assertEqual(found_lib, 1)
+        self.filecheck('platform shell cat "%s"' % types_log, __file__)
+        # CHECK: {{Adding reflection metadata in .*a\.out}}
+        # CHECK: {{Adding reflection metadata in .*dynamic_lib}}

lldb/test/API/lang/swift/reflection_only/TestSwiftReflectionOnly.py

@@ -18,7 +18,7 @@ def test(self):
             self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'),
             extra_images=['dynamic_lib'])
         log = self.getBuildArtifact('types.log')
-        self.expect('log enable lldb types -f ' + log)
+        self.expect('log enable lldb types -v -f ' + log)
 
         check_var = lldbutil.check_variable
         frame = thread.frames[0]