diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
index d0c484e8c2ee9..f9530f4ff05c5 100644
--- a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
+++ b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -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()) {
diff --git a/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp b/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
index a104754ad04d5..9f425803e574b 100644
--- a/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
+++ b/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
@@ -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, {});