Skip to content

Commit 5df4881

Browse files
authored
Merge pull request #6631 from kavon/manual-automerge-swift/release/5.9
Manual automerge swift/release/5.9
2 parents 98bf1bf + 2cecc88 commit 5df4881

File tree

5 files changed

+1
-85
lines changed

5 files changed

+1
-85
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ swift::ASTContext *SwiftASTContext::GetASTContext() {
29082908
GetLanguageOptions(), GetTypeCheckerOptions(), GetSILOptions(),
29092909
GetSearchPathOptions(), GetClangImporterOptions(),
29102910
GetSymbolGraphOptions(), GetSourceManager(), GetDiagnosticEngine(),
2911-
/*OutputBackend=*/nullptr, ReportModuleLoadingProgress));
2911+
ReportModuleLoadingProgress));
29122912
m_diagnostic_consumer_ap.reset(new StoringDiagnosticConsumer(*this));
29132913

29142914
if (getenv("LLDB_SWIFT_DUMP_DIAGS")) {

lldb/test/API/lang/swift/cxx_interop/backward/expressions/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

lldb/test/API/lang/swift/cxx_interop/backward/expressions/TestSwiftBackwardInteropExpressions.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

lldb/test/API/lang/swift/cxx_interop/backward/expressions/main.cpp

Lines changed: 0 additions & 16 deletions
This file was deleted.

lldb/test/API/lang/swift/cxx_interop/backward/expressions/swift-types.swift

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)