Skip to content

Update for apple/swift#32862 #1447

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
Jul 14, 2020
Merged

Update for apple/swift#32862 #1447

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions lldb/include/lldb/Symbol/SwiftASTContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class IRGenOptions;
class NominalTypeDecl;
class SearchPathOptions;
class SILModule;
class TBDGenOptions;
class VarDecl;
class ModuleDecl;
class SourceFile;
Expand Down Expand Up @@ -821,6 +822,7 @@ class SwiftASTContext : public TypeSystemSwift {
ConstString GetMangledTypeName(swift::TypeBase *);

swift::IRGenOptions &GetIRGenOptions();
swift::TBDGenOptions &GetTBDGenOptions();

void ModulesDidLoad(ModuleList &module_list);

Expand Down
4 changes: 2 additions & 2 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 @@ -1669,8 +1669,8 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
IRExecutionUnit::GetLLVMGlobalContextMutex());

auto GenModule = swift::performIRGeneration(
swift_ast_ctx->GetIRGenOptions(), &parsed_expr->module,
std::move(sil_module), "lldb_module",
&parsed_expr->module, swift_ast_ctx->GetIRGenOptions(),
swift_ast_ctx->GetTBDGenOptions(), std::move(sil_module), "lldb_module",
swift::PrimarySpecificPaths("", parsed_expr->main_filename),
llvm::ArrayRef<std::string>());

Expand Down
4 changes: 4 additions & 0 deletions lldb/source/Symbol/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2310,6 +2310,10 @@ swift::IRGenOptions &SwiftASTContext::GetIRGenOptions() {
return m_compiler_invocation_ap->getIRGenOptions();
}

swift::TBDGenOptions &SwiftASTContext::GetTBDGenOptions() {
return m_compiler_invocation_ap->getTBDGenOptions();
}

llvm::Triple SwiftASTContext::GetTriple() const {
VALID_OR_RETURN(llvm::Triple());
return llvm::Triple(m_compiler_invocation_ap->getTargetTriple());
Expand Down