Skip to content

Commit 3a667fe

Browse files
authored
Merge pull request #563 from CodaFi/east-const-story
[Gardening] Adjust for swiftlang/swift#29155
2 parents 61fa7dd + 5d455c2 commit 3a667fe

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,8 @@ static swift::ASTContext *SetupASTContext(
914914
if (repl || !playground)
915915
swift_ast_context->GetLanguageOptions().EnableThrowWithoutTry = true;
916916

917+
swift_ast_context->GetIRGenOptions().OutputKind =
918+
swift::IRGenOutputKind::Module;
917919
swift_ast_context->GetIRGenOptions().OptMode =
918920
swift::OptimizationMode::NoOptimization;
919921
// Normally we'd like to verify, but unfortunately the verifier's

lldb/source/Symbol/SwiftASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4880,7 +4880,7 @@ swift::irgen::IRGenModule &SwiftASTContext::GetIRGenModule() {
48804880
m_ir_gen_module_ap.reset(new swift::irgen::IRGenModule(
48814881
ir_generator, ir_generator.createTargetMachine(), nullptr,
48824882
GetGlobalLLVMContext(), ir_gen_opts.ModuleName, PSPs.OutputFilename,
4883-
PSPs.MainInputFilenameForDebugInfo));
4883+
PSPs.MainInputFilenameForDebugInfo, ""));
48844884
llvm::Module *llvm_module = m_ir_gen_module_ap->getModule();
48854885
llvm_module->setDataLayout(data_layout.getStringRepresentation());
48864886
llvm_module->setTargetTriple(llvm_triple.str());

0 commit comments

Comments
 (0)