Skip to content

Simplifying the flow #28010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from Nov 10, 2019
Merged

Simplifying the flow #28010

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f33b9
Simplified flow of Platform.cpp to reduce number of branches
Nov 1, 2019
27a1307
Update Platform.cpp
Nov 7, 2019
f7e8429
Update Platform.cpp
Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions lib/Basic/Platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,18 @@ bool swift::tripleIsAnySimulator(const llvm::Triple &triple) {
tripleIsAppleTVSimulator(triple);
}


bool swift::tripleRequiresRPathForSwiftInOS(const llvm::Triple &triple) {
if (triple.isMacOSX()) {
// macOS 10.14.4 contains a copy of Swift, but the linker will still use an
// rpath-based install name until 10.15.
return triple.isMacOSXVersionLT(10, 15);
}

} else if (triple.isiOS()) {
if (triple.isiOS()) {
return triple.isOSVersionLT(12, 2);
}

} else if (triple.isWatchOS()) {
if (triple.isWatchOS()) {
return triple.isOSVersionLT(5, 2);
}

Expand Down Expand Up @@ -196,20 +197,16 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {

StringRef swift::getMajorArchitectureName(const llvm::Triple &Triple) {
if (Triple.isOSLinux()) {
switch(Triple.getSubArch()) {
default:
return Triple.getArchName();
break;
switch (Triple.getSubArch()) {
case llvm::Triple::SubArchType::ARMSubArch_v7:
return "armv7";
break;
case llvm::Triple::SubArchType::ARMSubArch_v6:
return "armv6";
default:
break;
}
} else {
return Triple.getArchName();
}
return Triple.getArchName();
}

// The code below is responsible for normalizing target triples into the form
Expand Down Expand Up @@ -345,42 +342,34 @@ llvm::Triple swift::getTargetSpecificModuleTriple(const llvm::Triple &triple) {
}

Optional<llvm::VersionTuple>
swift::getSwiftRuntimeCompatibilityVersionForTarget(const llvm::Triple &Triple){
swift::getSwiftRuntimeCompatibilityVersionForTarget(
const llvm::Triple &Triple) {
unsigned Major, Minor, Micro;

if (Triple.isMacOSX()) {
Triple.getMacOSXVersion(Major, Minor, Micro);
if (Major == 10) {
if (Minor <= 14) {
return llvm::VersionTuple(5, 0);
} else if (Minor <= 15) {
return llvm::VersionTuple(5, 1);
} else {
return None;
}
} else {
return None;
}
} else if (Triple.isiOS()) { // includes tvOS
Triple.getiOSVersion(Major, Minor, Micro);
if (Major <= 12) {
return llvm::VersionTuple(5, 0);
} else if (Major <= 13) {
return llvm::VersionTuple(5, 1);
} else {
return None;
}
} else if (Triple.isWatchOS()) {
Triple.getWatchOSVersion(Major, Minor, Micro);
if (Major <= 5) {
return llvm::VersionTuple(5, 0);
} else if (Major <= 6) {
return llvm::VersionTuple(5, 1);
} else {
return None;
}
} else {
return None;
}
}

return None;
}