Merge pull request #11301 from swiftlang/lldb/func-call-labels-to-next

[lldb][Swift][NFC] Adapt Swift plugin callables to IterationAction

Author: Michael137

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

@@ -172,24 +172,24 @@ static ModuleSP findRuntime(Process &process, RuntimeKind runtime_kind) {
     if (runtime_kind == RuntimeKind::Swift && image &&
         IsModuleSwiftRuntime(process, *image)) {
       runtime_image = image;
-      return false;
+      return IterationAction::Stop;
     }
     if (runtime_kind == RuntimeKind::ObjC &&
         objc_runtime->IsModuleObjCLibrary(image)) {
       runtime_image = image;
-      return false;
+      return IterationAction::Stop;
     }
-    return true;
+    return IterationAction::Continue;
   });
 
   if (!runtime_image && runtime_kind == RuntimeKind::Swift) {
     // Do a more expensive search for a statically linked Swift runtime.
     process.GetTarget().GetImages().ForEach([&](const ModuleSP &image) {
       if (image && IsStaticSwiftRuntime(*image)) {
         runtime_image = image;
-        return false;
+        return IterationAction::Stop;
       }
-      return true;
+      return IterationAction::Continue;
     });
   }
   return runtime_image;
@@ -200,9 +200,9 @@ ModuleSP SwiftLanguageRuntime::FindConcurrencyModule(Process &process) {
   process.GetTarget().GetImages().ForEach([&](const ModuleSP &candidate) {
     if (candidate && IsModuleSwiftConcurrency(process, *candidate)) {
       concurrency_module = candidate;
-      return false;
+      return IterationAction::Stop;
     }
-    return true;
+    return IterationAction::Continue;
   });
   if (concurrency_module)
     return concurrency_module;
@@ -211,9 +211,9 @@ ModuleSP SwiftLanguageRuntime::FindConcurrencyModule(Process &process) {
   process.GetTarget().GetImages().ForEach([&](const ModuleSP &candidate) {
     if (candidate && IsStaticSwiftConcurrency(*candidate)) {
       concurrency_module = candidate;
-      return false;
+      return IterationAction::Stop;
     }
-    return true;
+    return IterationAction::Continue;
   });
   return concurrency_module;
 }
@@ -361,14 +361,15 @@ void SwiftLanguageRuntime::ProcessModulesToAdd() {
 
   // Add all defered modules to reflection context that were added to
   // the target since this SwiftLanguageRuntime was created.
-  modules_to_add_snapshot.ForEach([&](const ModuleSP &module_sp) -> bool {
-    if (module_sp) {
-      AddModuleToReflectionContext(module_sp);
-      progress.Increment(++completion,
-                         module_sp->GetFileSpec().GetFilename().GetString());
-    }
-    return true;
-  });
+  modules_to_add_snapshot.ForEach(
+      [&](const ModuleSP &module_sp) -> IterationAction {
+        if (module_sp) {
+          AddModuleToReflectionContext(module_sp);
+          progress.Increment(
+              ++completion, module_sp->GetFileSpec().GetFilename().GetString());
+        }
+        return IterationAction::Continue;
+      });
 }
 
 SwiftMetadataCache *SwiftLanguageRuntime::GetSwiftMetadataCache() {

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

@@ -4232,11 +4232,14 @@ void SwiftASTContext::LoadModule(swift::ModuleDecl *swift_module,
       if (!matching_module_list.IsEmpty()) {
         matching_module_list.ForEach(
             [&module_already_loaded, &module_spec,
-             &framework_name](const ModuleSP &module_sp) -> bool {
+             &framework_name](const ModuleSP &module_sp) -> IterationAction {
               module_already_loaded = module_spec.GetFileSpec().GetPath().find(
                                           framework_name) != std::string::npos;
-              return module_already_loaded ==
-                     false; // Keep iterating if we didn't find the right module
+              // Keep iterating if we didn't find the right module
+              if (!module_already_loaded)
+                return IterationAction::Continue;
+
+              return IterationAction::Stop;
             });
       }
       // If we already have this library loaded, don't try and load it again.

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

@@ -431,24 +431,27 @@ TypeSP TypeSystemSwiftTypeRefForExpressions::LookupClangType(
     return result;
 
   ModuleSP cur_module = sc.module_sp;
-  auto lookup = [&](const ModuleSP &m) -> bool {
+  auto lookup = [&](const ModuleSP &m) -> IterationAction {
     // Already visited this.
     if (m == cur_module)
-      return true;
+      return IterationAction::Continue;
 
     // Don't recursively call into LookupClangTypes() to avoid filling
     // hundreds of image caches with negative results.
     result = ::LookupClangType(const_cast<Module &>(*m), decl_context,
                                ignore_modules);
     // Cache it in the expression context.
-    if (result)
+    if (result) {
       m_clang_type_cache.Insert(name.AsCString(), result);
-    return !result;
+      return IterationAction::Stop;
+    }
+
+    return IterationAction::Continue;
   };
 
   // Visit the current module first as a performance optimization heuristic.
   if (cur_module)
-    if (!lookup(cur_module))
+    if (lookup(cur_module) == IterationAction::Stop)
       return result;
 
   if (TargetSP target_sp = GetTargetWP().lock())