fixup! remove current_module logic

Author: Michael137

lldb/source/Commands/CommandObjectTarget.cpp

@@ -3946,46 +3946,46 @@ class CommandObjectTargetModulesLookup : public CommandObjectParsed {
 
   Options *GetOptions() override { return &m_options; }
 
-  ModuleSP LookupHere(CommandInterpreter &interpreter,
-                      CommandReturnObject &result, bool &syntax_error) {
+  bool LookupHere(CommandInterpreter &interpreter, CommandReturnObject &result,
+                  bool &syntax_error) {
     switch (m_options.m_type) {
     case eLookupTypeAddress:
     case eLookupTypeFileLine:
     case eLookupTypeFunction:
     case eLookupTypeFunctionOrSymbol:
     case eLookupTypeSymbol:
     default:
-      return nullptr;
+      return false;
     case eLookupTypeType:
       break;
     }
 
     StackFrameSP frame = m_exe_ctx.GetFrameSP();
 
     if (!frame)
-      return nullptr;
+      return false;
 
     const SymbolContext &sym_ctx(frame->GetSymbolContext(eSymbolContextModule));
 
     if (!sym_ctx.module_sp)
-      return nullptr;
+      return false;
 
     switch (m_options.m_type) {
     default:
-      return nullptr;
+      return false;
     case eLookupTypeType:
       if (!m_options.m_str.empty()) {
         if (LookupTypeHere(&GetTarget(), m_interpreter,
                            result.GetOutputStream(), *sym_ctx.module_sp,
                            m_options.m_str.c_str(), m_options.m_use_regex)) {
           result.SetStatus(eReturnStatusSuccessFinishResult);
-          return sym_ctx.module_sp;
+          return true;
         }
       }
       break;
     }
 
-    return nullptr;
+    return false;
   }
 
   bool LookupInModule(CommandInterpreter &interpreter, Module *module,
@@ -4089,9 +4089,7 @@ class CommandObjectTargetModulesLookup : public CommandObjectParsed {
       // Where it is possible to look in the current symbol context first,
       // try that.  If this search was successful and --all was not passed,
       // don't print anything else.
-      ModuleSP current_module_sp =
-          LookupHere(m_interpreter, result, syntax_error);
-      if (current_module_sp) {
+      if (LookupHere(m_interpreter, result, syntax_error)) {
         result.GetOutputStream().EOL();
         num_successful_lookups++;
         if (!m_options.m_print_all) {
@@ -4110,8 +4108,7 @@ class CommandObjectTargetModulesLookup : public CommandObjectParsed {
       }
 
       for (ModuleSP module_sp : target_modules.ModulesNoLocking()) {
-        if (module_sp != current_module_sp &&
-            LookupInModule(m_interpreter, module_sp.get(), result,
+        if (LookupInModule(m_interpreter, module_sp.get(), result,
                            syntax_error)) {
           result.GetOutputStream().EOL();
           num_successful_lookups++;

lldb/test/Shell/Commands/command-image-lookup-current-module.test

@@ -39,5 +39,6 @@ target modules lookup --type Foo --all
 # CHECK-NEXT: Best match found in
 # CHECK-NEXT: name = "Foo"
 
+# CHECK: 1 match found in {{.*}}.out
 # CHECK: 1 match found in {{.*}}lib1.dylib
 # CHECK: 1 match found in {{.*}}lib2.dylib