Skip to content
GitLab
Commit 1fdec59b authored by Andi-Bogdan Postelnicu's avatar Andi-Bogdan Postelnicu Committed by Tom Stellard
Browse files

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

Fix fallout caused by D89156 on 11.0.1 for MacOS

Differential Revision: https://reviews.llvm.org/D95683
parent 85fcd465
Hide whitespace changes
Inline Side-by-side
lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
View file @ 1fdec59b
......@@ -282,7 +282,7 @@ Status PlatformAppleTVSimulator::GetSymbolFile(const FileSpec &platform_file,
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_modules, 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.
......@@ -296,9 +296,9 @@ Status PlatformAppleTVSimulator::GetSharedModule(
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,
did_create_ptr, always_create);
error = ModuleList::GetSharedModule(module_spec, module_sp,
module_search_paths_ptr, old_modules,
did_create_ptr, always_create);
}
if (module_sp)
module_sp->SetPlatformFileSpec(platform_file);
......
lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h
View file @ 1fdec59b
......@@ -55,7 +55,7 @@ public:
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_modules,
bool *did_create_ptr) override;
uint32_t
......
lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
View file @ 1fdec59b
......@@ -283,7 +283,7 @@ Status PlatformAppleWatchSimulator::GetSymbolFile(const FileSpec &platform_file,
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_modules, 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.
......@@ -297,9 +297,9 @@ Status PlatformAppleWatchSimulator::GetSharedModule(
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,
did_create_ptr, always_create);
error = ModuleList::GetSharedModule(module_spec, module_sp,
module_search_paths_ptr, old_modules,
did_create_ptr, always_create);
}
if (module_sp)
module_sp->SetPlatformFileSpec(platform_file);
......
lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h
View file @ 1fdec59b
......@@ -55,7 +55,7 @@ public:
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_modules,
bool *did_create_ptr) override;
uint32_t
......
lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
View file @ 1fdec59b
......@@ -730,7 +730,7 @@ Status PlatformDarwinKernel::GetSharedModule(
// 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;
}
......
lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
View file @ 1fdec59b
......@@ -286,8 +286,8 @@ Status PlatformiOSSimulator::GetSymbolFile(const FileSpec &platform_file,
Status PlatformiOSSimulator::GetSharedModule(
const ModuleSpec &module_spec, Process *process, ModuleSP &module_sp,
const FileSpecList *module_search_paths_ptr, ModuleSP *old_module_sp_ptr,
bool *did_create_ptr) {
const FileSpecList *module_search_paths_ptr,
llvm::SmallVectorImpl<lldb::ModuleSP> *old_modules, 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.
......@@ -301,9 +301,9 @@ Status PlatformiOSSimulator::GetSharedModule(
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,
did_create_ptr, always_create);
error = ModuleList::GetSharedModule(module_spec, module_sp,
module_search_paths_ptr, old_modules,
did_create_ptr, always_create);
}
if (module_sp)
module_sp->SetPlatformFileSpec(platform_file);
......
lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
View file @ 1fdec59b
......@@ -57,7 +57,7 @@ public:
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_modules,
bool *did_create_ptr) override;
uint32_t
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment