Skip to content

[lldb] Use getters to retrieve Swift module search paths #3766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2022
Merged

[lldb] Use getters to retrieve Swift module search paths #3766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 35 additions & 23 deletions lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,9 +2090,9 @@ ProcessModule(ModuleSP module_sp, std::string m_description,

const auto &opts = invocation.getSearchPathOptions();
module_search_paths.insert(module_search_paths.end(),
opts.ImportSearchPaths.begin(),
opts.ImportSearchPaths.end());
for (const auto &fwsp : opts.FrameworkSearchPaths)
opts.getImportSearchPaths().begin(),
opts.getImportSearchPaths().end());
for (const auto &fwsp : opts.getFrameworkSearchPaths())
framework_search_paths.push_back({fwsp.Path, fwsp.IsSystem});
auto &clang_opts = invocation.getClangImporterOptions().ExtraArgs;
for (const std::string &arg : clang_opts) {
Expand Down Expand Up @@ -2673,8 +2673,8 @@ void SwiftASTContext::InitializeSearchPathOptions(
}

llvm::StringMap<bool> processed;
std::vector<std::string> &invocation_import_paths =
invocation.getSearchPathOptions().ImportSearchPaths;
std::vector<std::string> invocation_import_paths(
invocation.getSearchPathOptions().getImportSearchPaths());
// Add all deserialized paths to the map.
for (const auto &path : invocation_import_paths)
processed.insert({path, false});
Expand All @@ -2685,11 +2685,14 @@ void SwiftASTContext::InitializeSearchPathOptions(
if (it_notseen.second)
invocation_import_paths.push_back(path);
}
invocation.getSearchPathOptions().setImportSearchPaths(
invocation_import_paths);

// This preserves the IsSystem bit, but deduplicates entries ignoring it.
processed.clear();
auto &invocation_framework_paths =
invocation.getSearchPathOptions().FrameworkSearchPaths;
std::vector<swift::SearchPathOptions::FrameworkSearchPath>
invocation_framework_paths(
invocation.getSearchPathOptions().getFrameworkSearchPaths());
// Add all deserialized paths to the map.
for (const auto &path : invocation_framework_paths)
processed.insert({path.Path, path.IsSystem});
Expand All @@ -2700,6 +2703,8 @@ void SwiftASTContext::InitializeSearchPathOptions(
if (it_notseen.second)
invocation_framework_paths.push_back({path.first, path.second});
}
invocation.getSearchPathOptions().setFrameworkSearchPaths(
invocation_framework_paths);
}

namespace lldb_private {
Expand Down Expand Up @@ -3361,7 +3366,8 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
std::string moduleCachePath = "";
std::unique_ptr<swift::ClangImporter> clang_importer_ap;
auto &clang_importer_options = GetClangImporterOptions();
if (!m_ast_context_ap->SearchPathOpts.SDKPath.empty() || TargetHasNoSDK()) {
if (!m_ast_context_ap->SearchPathOpts.getSDKPath().empty() ||
TargetHasNoSDK()) {
if (!clang_importer_options.OverrideResourceDir.empty()) {
// Create the DWARFImporterDelegate.
const auto &props = ModuleList::GetGlobalModuleListProperties();
Expand Down Expand Up @@ -3419,7 +3425,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
if (!sdk_version) {
auto SDKInfoOrErr = clang::parseDarwinSDKInfo(
*llvm::vfs::getRealFileSystem(),
m_ast_context_ap->SearchPathOpts.SDKPath);
m_ast_context_ap->SearchPathOpts.getSDKPath());
if (SDKInfoOrErr) {
if (auto SDKInfo = *SDKInfoOrErr)
sdk_version = swift::getTargetSDKVersion(*SDKInfo, triple);
Expand Down Expand Up @@ -3720,16 +3726,17 @@ swift::ModuleDecl *SwiftASTContext::GetModule(const FileSpec &module_spec,

std::string module_directory(module_spec.GetDirectory().GetCString());
bool add_search_path = true;
for (auto path : ast->SearchPathOpts.ImportSearchPaths) {
for (auto path : ast->SearchPathOpts.getImportSearchPaths()) {
if (path == module_directory) {
add_search_path = false;
break;
}
}
// Add the search path if needed so we can find the module by basename.
if (add_search_path)
ast->SearchPathOpts.ImportSearchPaths.push_back(
std::move(module_directory));
if (add_search_path) {
ast->addSearchPath(module_directory, /*isFramework=*/false,
/*isSystem=*/false);
}

typedef swift::Located<swift::Identifier> ModuleNameSpec;
llvm::StringRef module_basename_sref(module_basename.GetCString());
Expand Down Expand Up @@ -3928,7 +3935,8 @@ void SwiftASTContext::LoadModule(swift::ModuleDecl *swift_module,
std::vector<std::string> uniqued_paths;

for (const auto &framework_search_dir :
swift_module->getASTContext().SearchPathOpts.FrameworkSearchPaths) {
swift_module->getASTContext()
.SearchPathOpts.getFrameworkSearchPaths()) {
// The framework search dir as it comes from the AST context
// often has duplicate entries, don't try to load along the
// same path twice.
Expand Down Expand Up @@ -5126,8 +5134,9 @@ void SwiftASTContext::LogConfiguration() {

HEALTH_LOG_PRINTF(" Architecture : %s",
m_ast_context_ap->LangOpts.Target.getTriple().c_str());
HEALTH_LOG_PRINTF(" SDK path : %s",
m_ast_context_ap->SearchPathOpts.SDKPath.c_str());
HEALTH_LOG_PRINTF(
" SDK path : %s",
m_ast_context_ap->SearchPathOpts.getSDKPath().str().c_str());
HEALTH_LOG_PRINTF(
" Runtime resource path : %s",
m_ast_context_ap->SearchPathOpts.RuntimeResourcePath.c_str());
Expand All @@ -5142,26 +5151,29 @@ void SwiftASTContext::LogConfiguration() {

HEALTH_LOG_PRINTF(" Runtime library import paths : (%llu items)",
(unsigned long long)m_ast_context_ap->SearchPathOpts
.RuntimeLibraryImportPaths.size());
.getRuntimeLibraryImportPaths()
.size());

for (const auto &runtime_import_path :
m_ast_context_ap->SearchPathOpts.RuntimeLibraryImportPaths) {
m_ast_context_ap->SearchPathOpts.getRuntimeLibraryImportPaths()) {
HEALTH_LOG_PRINTF(" %s", runtime_import_path.c_str());
}

HEALTH_LOG_PRINTF(" Framework search paths : (%llu items)",
(unsigned long long)m_ast_context_ap->SearchPathOpts
.FrameworkSearchPaths.size());
.getFrameworkSearchPaths()
.size());
for (const auto &framework_search_path :
m_ast_context_ap->SearchPathOpts.FrameworkSearchPaths) {
m_ast_context_ap->SearchPathOpts.getFrameworkSearchPaths()) {
HEALTH_LOG_PRINTF(" %s", framework_search_path.Path.c_str());
}

HEALTH_LOG_PRINTF(" Import search paths : (%llu items)",
(unsigned long long)m_ast_context_ap->SearchPathOpts
.ImportSearchPaths.size());
for (std::string &import_search_path :
m_ast_context_ap->SearchPathOpts.ImportSearchPaths) {
.getImportSearchPaths()
.size());
for (const std::string &import_search_path :
m_ast_context_ap->SearchPathOpts.getImportSearchPaths()) {
HEALTH_LOG_PRINTF(" %s", import_search_path.c_str());
}

Expand Down