Revert SE-0283 (#34492)

Reverted despite build failures.
This commit is contained in:
Alejandro Alonso
2020-10-29 20:32:06 -04:00
committed by GitHub
parent 142b726708
commit 424802fb34
55 changed files with 100 additions and 3033 deletions

View File

@@ -378,10 +378,8 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
} else if (Minor <= 15) {
if (Micro <= 3) {
return llvm::VersionTuple(5, 1);
} else if (Micro <= 4) {
return llvm::VersionTuple(5, 2);
} else {
return llvm::VersionTuple(5, 3);
return llvm::VersionTuple(5, 2);
}
}
} else if (Major == 11) {
@@ -401,10 +399,8 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
} else if (Major <= 13) {
if (Minor <= 3) {
return llvm::VersionTuple(5, 1);
} else if (Minor <= 4) {
return llvm::VersionTuple(5, 2);
} else {
return llvm::VersionTuple(5, 3);
return llvm::VersionTuple(5, 2);
}
}
} else if (Triple.isWatchOS()) {
@@ -414,10 +410,8 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
} else if (Major <= 6) {
if (Minor <= 1) {
return llvm::VersionTuple(5, 1);
} else if (Minor <= 2) {
return llvm::VersionTuple(5, 2);
} else {
return llvm::VersionTuple(5, 3);
return llvm::VersionTuple(5, 2);
}
}
}