Skip to content

Commit 344e128

Browse files
author
git apple-llvm automerger
committed
Merge commit '0d8d3f0cfb6b' from swift/release/5.9 into stable/20221013
2 parents 08acae2 + 0d8d3f0 commit 344e128

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lldb/source/Core/Module.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,13 +1186,17 @@ void Module::ReportWarningCantLoadSwiftModule(
11861186
&m_swift_import_warning);
11871187
}
11881188

1189+
static llvm::VersionTuple GetAdjustedVersion(llvm::VersionTuple version) {
1190+
return version;
1191+
}
1192+
11891193
void Module::ReportWarningToolchainMismatch(
11901194
CompileUnit &comp_unit, llvm::Optional<lldb::user_id_t> debugger_id) {
11911195
if (SymbolFile *sym_file = GetSymbolFile()) {
11921196
llvm::VersionTuple sym_file_version =
1193-
sym_file->GetProducerVersion(comp_unit);
1197+
GetAdjustedVersion(sym_file->GetProducerVersion(comp_unit));
11941198
llvm::VersionTuple swift_version =
1195-
swift::version::getCurrentCompilerVersion();
1199+
GetAdjustedVersion(swift::version::getCurrentCompilerVersion());
11961200
if (sym_file_version != swift_version) {
11971201
std::string str = llvm::formatv(
11981202
"{0} was compiled with a different Swift compiler "

0 commit comments

Comments
 (0)