[lldb] Fix fallout caused by D89156 on 11.0.1 for MacOS

[Abpostelnicu]

Summary

Fix fallout caused by D89156 on 11.0.1 for MacOS

[Abpostelnicu]

Update with format

[JosephTremoulet]

LGTM (and thanks for the fix and apologies for the break) )but I think @tstellar should have a look given it's fixing a build break in the release/11.x branch caused by my porting of changes from master for https://bugs.llvm.org/show_bug.cgi?id=48053

lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h

58

D89156 pluralized the name (old_modules with an s) in all the places it made this change, since it's now a collection. IMO it would make sense to do the same in this change.

[Abpostelnicu]

Update for plularization of variables name.

[Abpostelnicu]

lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h

58

Thanks, it makes sense to be pluralized.

[Abpostelnicu]

@tstellar what do you suggest to do here?

[Abpostelnicu]

rebased on 11.1rc2

[Abpostelnicu]

The failure is wrong.

[Abpostelnicu]

Landed in 11.1 https://github.com/llvm/llvm-project/commit/1fdec59bffc11ae37eb51a1b9869f0696bfd5312#diff-2fa23ad0cf1839955ddaf4a0d78a9d9b5fd9b88933f82f6433035916a2655c6c.
Patch needs to be rebased for trunk now.

[Abpostelnicu]

This has landed and trunk is already fixed.

lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h

 //===-- PlatformAppleTVSimulator.h ------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
public:
   GetSymbolFile(const lldb_private::FileSpec &platform_file,
                 const lldb_private::UUID *uuid_ptr,
                 lldb_private::FileSpec &local_file);
 
   lldb_private::Status
   GetSharedModule(const lldb_private::ModuleSpec &module_spec,
                   lldb_private::Process *process, lldb::ModuleSP &module_sp,
                   const lldb_private::FileSpecList *module_search_paths_ptr,
-                  lldb::ModuleSP *old_module_sp_ptr,
+                  llvm::SmallVectorImpl<lldb::ModuleSP> *old_module,
                   bool *did_create_ptr) override;
 
   uint32_t
   FindProcesses(const lldb_private::ProcessInstanceInfoMatch &match_info,
                 lldb_private::ProcessInstanceInfoList &process_infos) override;
 
   bool GetSupportedArchitectureAtIndex(uint32_t idx,
                                        lldb_private::ArchSpec &arch) override;

lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp

 //===-- PlatformAppleTVSimulator.cpp --------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path))) {
     error.SetErrorString("invalid platform file argument");
   }
   return error;
 }
 
 Status PlatformAppleTVSimulator::GetSharedModule(
     const ModuleSpec &module_spec, lldb_private::Process *process,
     ModuleSP &module_sp, const FileSpecList *module_search_paths_ptr,
-    ModuleSP *old_module_sp_ptr, bool *did_create_ptr) {
+    llvm::SmallVectorImpl<lldb::ModuleSP> *old_module, bool *did_create_ptr) {
   // For AppleTV, the SDK files are all cached locally on the host system. So
   // first we ask for the file in the cached SDK, then we attempt to get a
   // shared module for the right architecture with the right UUID.
   Status error;
   ModuleSpec platform_module_spec(module_spec);
   const FileSpec &platform_file = module_spec.GetFileSpec();
   error = GetSymbolFile(platform_file, module_spec.GetUUIDPtr(),
                         platform_module_spec.GetFileSpec());
   if (error.Success()) {
     error = ResolveExecutable(platform_module_spec, module_sp,
                               module_search_paths_ptr);
   } else {
     const bool always_create = false;
     error = ModuleList::GetSharedModule(
-        module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr,
+        module_spec, module_sp, module_search_paths_ptr, old_module,
         did_create_ptr, always_create);
   }
   if (module_sp)
     module_sp->SetPlatformFileSpec(platform_file);
 
   return error;
 }
 

lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h

 //===-- PlatformAppleWatchSimulator.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
public:
   GetSymbolFile(const lldb_private::FileSpec &platform_file,
                 const lldb_private::UUID *uuid_ptr,
                 lldb_private::FileSpec &local_file);
 
   lldb_private::Status
   GetSharedModule(const lldb_private::ModuleSpec &module_spec,
                   lldb_private::Process *process, lldb::ModuleSP &module_sp,
                   const lldb_private::FileSpecList *module_search_paths_ptr,
-                  lldb::ModuleSP *old_module_sp_ptr,
+                  llvm::SmallVectorImpl<lldb::ModuleSP> *old_module,
                   bool *did_create_ptr) override;
 
   uint32_t
   FindProcesses(const lldb_private::ProcessInstanceInfoMatch &match_info,
                 lldb_private::ProcessInstanceInfoList &process_infos) override;
 
   bool GetSupportedArchitectureAtIndex(uint32_t idx,
                                        lldb_private::ArchSpec &arch) override;

lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp

 //===-- PlatformAppleWatchSimulator.cpp -----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path))) {
     error.SetErrorString("invalid platform file argument");
   }
   return error;
 }
 
 Status PlatformAppleWatchSimulator::GetSharedModule(
     const ModuleSpec &module_spec, lldb_private::Process *process,
     ModuleSP &module_sp, const FileSpecList *module_search_paths_ptr,
-    ModuleSP *old_module_sp_ptr, bool *did_create_ptr) {
+    llvm::SmallVectorImpl<lldb::ModuleSP> *old_module, bool *did_create_ptr) {
   // For AppleWatch, the SDK files are all cached locally on the host system.
   // So first we ask for the file in the cached SDK, then we attempt to get a
   // shared module for the right architecture with the right UUID.
   Status error;
   ModuleSpec platform_module_spec(module_spec);
   const FileSpec &platform_file = module_spec.GetFileSpec();
   error = GetSymbolFile(platform_file, module_spec.GetUUIDPtr(),
                         platform_module_spec.GetFileSpec());
   if (error.Success()) {
     error = ResolveExecutable(platform_module_spec, module_sp,
                               module_search_paths_ptr);
   } else {
     const bool always_create = false;
     error = ModuleList::GetSharedModule(
-        module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr,
+        module_spec, module_sp, module_search_paths_ptr, old_module,
         did_create_ptr, always_create);
   }
   if (module_sp)
     module_sp->SetPlatformFileSpec(platform_file);
 
   return error;
 }
 

lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp

 //===-- PlatformDarwinKernel.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
for (auto possible_kernel : m_kernel_binaries_with_dsyms) {
         }
       }
     }
 
     // Give the generic methods, including possibly calling into  DebugSymbols
     // framework on macOS systems, a chance.
     error = PlatformDarwin::GetSharedModule(module_spec, process, module_sp,
                                             module_search_paths_ptr,
-                                            old_module_sp_ptr, did_create_ptr);
+                                            old_modules, did_create_ptr);
     if (error.Success() && module_sp.get()) {
       return error;
     }
 
     // Next try all kernel binaries that don't have a dSYM
     for (auto possible_kernel : m_kernel_binaries_without_dsyms) {
       if (FileSystem::Instance().Exists(possible_kernel)) {
         ModuleSpec kern_spec(possible_kernel);

lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h

 //===-- PlatformiOSSimulator.h ----------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
public:
   GetSymbolFile(const lldb_private::FileSpec &platform_file,
                 const lldb_private::UUID *uuid_ptr,
                 lldb_private::FileSpec &local_file);
 
   lldb_private::Status
   GetSharedModule(const lldb_private::ModuleSpec &module_spec,
                   lldb_private::Process *process, lldb::ModuleSP &module_sp,
                   const lldb_private::FileSpecList *module_search_paths_ptr,
-                  lldb::ModuleSP *old_module_sp_ptr,
+                  llvm::SmallVectorImpl<lldb::ModuleSP> *old_module,
                   bool *did_create_ptr) override;
 
   uint32_t
   FindProcesses(const lldb_private::ProcessInstanceInfoMatch &match_info,
                 lldb_private::ProcessInstanceInfoList &process_infos) override;
 
   bool GetSupportedArchitectureAtIndex(uint32_t idx,
                                        lldb_private::ArchSpec &arch) override;

lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp

 //===-- PlatformiOSSimulator.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
Status PlatformiOSSimulator::GetSymbolFile(const FileSpec &platform_file,
   } else {
     error.SetErrorString("invalid platform file argument");
   }
   return error;
 }
 
 Status PlatformiOSSimulator::GetSharedModule(
     const ModuleSpec &module_spec, Process *process, ModuleSP &module_sp,
-    const FileSpecList *module_search_paths_ptr, ModuleSP *old_module_sp_ptr,
+    const FileSpecList *module_search_paths_ptr, llvm::SmallVectorImpl<lldb::ModuleSP> *old_module,
     bool *did_create_ptr) {
   // For iOS, the SDK files are all cached locally on the host system. So first
   // we ask for the file in the cached SDK, then we attempt to get a shared
   // module for the right architecture with the right UUID.
   Status error;
   ModuleSpec platform_module_spec(module_spec);
   const FileSpec &platform_file = module_spec.GetFileSpec();
   error = GetSymbolFile(platform_file, module_spec.GetUUIDPtr(),
                         platform_module_spec.GetFileSpec());
   if (error.Success()) {
     error = ResolveExecutable(platform_module_spec, module_sp,
                               module_search_paths_ptr);
   } else {
     const bool always_create = false;
     error = ModuleList::GetSharedModule(
-        module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr,
+        module_spec, module_sp, module_search_paths_ptr, old_module,
         did_create_ptr, always_create);
   }
   if (module_sp)
     module_sp->SetPlatformFileSpec(platform_file);
 
   return error;
 }