Skip to content

Commit 86ff24b

Browse files
committed
[NFC] Clean up unused simulator special cases
The previous commit makes various simulator-specific platform helpers dead code. Remove them.
1 parent 9a76985 commit 86ff24b

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

include/swift/Basic/Platform.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ namespace swift {
7171
/// Returns the platform Kind for Darwin triples.
7272
DarwinPlatformKind getDarwinPlatformKind(const llvm::Triple &triple);
7373

74-
/// Maps an arbitrary platform to its non-simulator equivalent.
75-
///
76-
/// If \p platform is not a simulator platform, it will be returned as is.
77-
DarwinPlatformKind getNonSimulatorPlatform(DarwinPlatformKind platform);
78-
7974
/// Returns the architecture component of the path for a given target triple.
8075
///
8176
/// Typically this is used for mapping the architecture component of the

lib/Basic/Platform.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,23 +123,6 @@ DarwinPlatformKind swift::getDarwinPlatformKind(const llvm::Triple &triple) {
123123
llvm_unreachable("Unsupported Darwin platform");
124124
}
125125

126-
DarwinPlatformKind swift::getNonSimulatorPlatform(DarwinPlatformKind platform) {
127-
switch (platform) {
128-
case DarwinPlatformKind::MacOS:
129-
return DarwinPlatformKind::MacOS;
130-
case DarwinPlatformKind::IPhoneOS:
131-
case DarwinPlatformKind::IPhoneOSSimulator:
132-
return DarwinPlatformKind::IPhoneOS;
133-
case DarwinPlatformKind::TvOS:
134-
case DarwinPlatformKind::TvOSSimulator:
135-
return DarwinPlatformKind::TvOS;
136-
case DarwinPlatformKind::WatchOS:
137-
case DarwinPlatformKind::WatchOSSimulator:
138-
return DarwinPlatformKind::WatchOS;
139-
}
140-
llvm_unreachable("Unsupported Darwin platform");
141-
}
142-
143126
static StringRef getPlatformNameForDarwin(const DarwinPlatformKind platform) {
144127
switch (platform) {
145128
case DarwinPlatformKind::MacOS:

lib/Driver/DarwinToolChains.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,9 @@ toolchains::Darwin::constructInvocation(const InterpretJobAction &job,
8989
}
9090

9191
static StringRef
92-
getDarwinLibraryNameSuffixForTriple(const llvm::Triple &triple,
93-
bool distinguishSimulator = true) {
92+
getDarwinLibraryNameSuffixForTriple(const llvm::Triple &triple) {
9493
const DarwinPlatformKind kind = getDarwinPlatformKind(triple);
95-
const DarwinPlatformKind effectiveKind =
96-
distinguishSimulator ? kind : getNonSimulatorPlatform(kind);
97-
switch (effectiveKind) {
94+
switch (kind) {
9895
case DarwinPlatformKind::MacOS:
9996
return "osx";
10097
case DarwinPlatformKind::IPhoneOS:

0 commit comments

Comments
 (0)