Skip to content

Commit d918e1d

Browse files
authored
Merge pull request #1469 from hamishknight/a-series-of-tubes
Update for swiftlang/swift#32914
2 parents a2e0564 + f3ba812 commit d918e1d

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,12 +1668,18 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
16681668
std::lock_guard<std::recursive_mutex> global_context_locker(
16691669
IRExecutionUnit::GetLLVMGlobalContextMutex());
16701670

1671+
const auto &IRGenOpts = swift_ast_ctx->GetIRGenOptions();
1672+
16711673
auto GenModule = swift::performIRGeneration(
1672-
&parsed_expr->module, swift_ast_ctx->GetIRGenOptions(),
1673-
swift_ast_ctx->GetTBDGenOptions(), std::move(sil_module), "lldb_module",
1674+
&parsed_expr->module, IRGenOpts, swift_ast_ctx->GetTBDGenOptions(),
1675+
std::move(sil_module), "lldb_module",
16741676
swift::PrimarySpecificPaths("", parsed_expr->main_filename),
16751677
llvm::ArrayRef<std::string>());
1676-
1678+
1679+
if (GenModule) {
1680+
swift::performLLVMOptimizations(IRGenOpts, GenModule.getModule(),
1681+
GenModule.getTargetMachine());
1682+
}
16771683
auto ContextAndModule = std::move(GenModule).release();
16781684
m_llvm_context.reset(ContextAndModule.first);
16791685
m_module.reset(ContextAndModule.second);

0 commit comments

Comments
 (0)