Skip to content

Fix swift/master-next #633

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 4 commits into from
Jan 22, 2020
Merged

Fix swift/master-next #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e27098
[lldb] Adjust to changes in SILModule::print
bulbazord Jan 22, 2020
1900a4b
[lldb] Remove function SymbolFileDWARF::GetSymlinkPaths
bulbazord Jan 22, 2020
8ba776b
[lldb] Adjust to changes in ClangASTContext constructor
bulbazord Jan 22, 2020
1240129
[lldb] Adjust for implicitly-deleted copy constructor of ModuleListPr…
bulbazord Jan 22, 2020
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
9 changes: 3 additions & 6 deletions lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,8 +1651,7 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
if (log) {
std::string s;
llvm::raw_string_ostream ss(s);
const bool verbose = false;
sil_module->print(ss, verbose, &parsed_expr->module);
sil_module->print(ss, &parsed_expr->module);
ss.flush();

log->Printf("SIL module before linking:");
Expand All @@ -1667,8 +1666,7 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
if (log) {
std::string s;
llvm::raw_string_ostream ss(s);
const bool verbose = false;
sil_module->print(ss, verbose, &parsed_expr->module);
sil_module->print(ss, &parsed_expr->module);
ss.flush();

log->Printf("Generated SIL module:");
Expand All @@ -1681,8 +1679,7 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
if (log) {
std::string s;
llvm::raw_string_ostream ss(s);
const bool verbose = false;
sil_module->print(ss, verbose, &parsed_expr->module);
sil_module->print(ss, &parsed_expr->module);
ss.flush();

log->Printf("SIL module after diagnostic passes:");
Expand Down
4 changes: 0 additions & 4 deletions lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,6 @@ ParseSupportFilesFromPrologue(const lldb::ModuleSP &module,
return support_files;
}

FileSpecList SymbolFileDWARF::GetSymlinkPaths() {
return GetGlobalPluginProperties()->GetSymLinkPaths();
}

static inline bool IsSwiftLanguage(LanguageType language) {
return language == eLanguageTypePLI || language == eLanguageTypeSwift ||
((uint32_t)language == (uint32_t)llvm::dwarf::DW_LANG_Swift);
Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Symbol/ClangASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,8 @@ void ClangASTContext::CreateASTContext() {
ClangASTContext *ClangASTContext::GetASTContext(clang::ASTContext *ast) {
ClangASTContext *clang_ast = GetASTMap().Lookup(ast);
if (!clang_ast)
clang_ast = new ClangASTContext(*ast);
clang_ast = new ClangASTContext(
"ASTContext from ClangASTContext::GetASTContext", *ast);
return clang_ast;
}

Expand Down
8 changes: 4 additions & 4 deletions lldb/source/Symbol/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ static bool IsDeviceSupport(const char *path) {

static std::string GetClangModulesCacheProperty() {
llvm::SmallString<128> path;
auto props = ModuleList::GetGlobalModuleListProperties();
const auto &props = ModuleList::GetGlobalModuleListProperties();
props.GetClangModulesCachePath().GetPath(path);
return path.str();
}
Expand Down Expand Up @@ -2690,7 +2690,7 @@ swift::ClangImporterOptions &SwiftASTContext::GetClangImporterOptions() {

// Set the Clang module search path.
llvm::SmallString<128> path;
auto props = ModuleList::GetGlobalModuleListProperties();
const auto &props = ModuleList::GetGlobalModuleListProperties();
props.GetClangModulesCachePath().GetPath(path);
clang_importer_options.ModuleCachePath = path.str();

Expand Down Expand Up @@ -3423,7 +3423,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
if (!m_ast_context_ap->SearchPathOpts.SDKPath.empty() || TargetHasNoSDK()) {
if (!clang_importer_options.OverrideResourceDir.empty()) {
// Create the DWARFImporterDelegate.
auto props = ModuleList::GetGlobalModuleListProperties();
const auto &props = ModuleList::GetGlobalModuleListProperties();
if (props.GetUseDWARFImporter())
m_dwarf_importer_delegate_up =
std::make_unique<SwiftDWARFImporterDelegate>(*this);
Expand Down Expand Up @@ -3480,7 +3480,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
prebuiltModuleCachePath.c_str());

// Determine the Swift module loading mode to use.
auto props = ModuleList::GetGlobalModuleListProperties();
const auto &props = ModuleList::GetGlobalModuleListProperties();
swift::ModuleLoadingMode loading_mode;
switch (props.GetSwiftModuleLoadingMode()) {
case eSwiftModuleLoadingModePreferSerialized:
Expand Down