Skip to content

Update for a ClangImporter::create change #12037

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

Open
hjyamauchi wants to merge 1 commit into
base: stable/21.x
Choose a base branch
from
+4 −3
Open

Update for a ClangImporter::create change #12037

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
4 changes: 2 additions & 2 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 @@ -3758,8 +3758,8 @@ ThreadSafeASTContext SwiftASTContext::GetASTContext() {
std::make_unique<SwiftDWARFImporterDelegate>(*this);
auto importer_diags = getScopedDiagnosticConsumer();
clang_importer_up = swift::ClangImporter::create(
*m_ast_context_up, "", m_dependency_tracker.get(),
m_dwarfimporter_delegate_up.get());
*m_ast_context_up, &GetCompilerInvocation().getIRGenOptions(),
"", m_dependency_tracker.get(), m_dwarfimporter_delegate_up.get());

// Handle any errors.
if (!clang_importer_up || importer_diags->HasErrors()) {
Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ class ClangNameImporter {
m_compiler_invocation.getCASOptions(),
m_compiler_invocation.getSerializationOptions(),
m_source_manager, m_diagnostic_engine));
m_clang_importer = swift::ClangImporter::create(*m_ast_context, "", {}, {});
m_clang_importer = swift::ClangImporter::create(*m_ast_context,
nullptr, "", {}, {});
}
std::string ImportName(const clang::NamedDecl *decl) {
swift::DeclName imported_name = m_clang_importer->importName(decl, {});
Expand Down