Skip to content

Commit 51eb34b

Browse files
shahmishalshahmishal
authored
Merge pull request #15088 from apple/master-llvm-swift5-transition
Swift changes require for updating stable branch
2 parents 2608726 + 8ace18c commit 51eb34b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+169
-165
lines changed

‎cmake/modules/AddSwift.cmake

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,29 @@ function(_add_variant_c_compile_link_flags)
100100

101101
set(result ${${CFLAGS_RESULT_VAR_NAME}})
102102

103+
is_darwin_based_sdk("${CFLAGS_SDK}" IS_DARWIN)
104+
if(IS_DARWIN)
105+
# Check if there's a specific OS deployment version needed for this invocation
106+
if("${CFLAGS_SDK}" STREQUAL "OSX")
107+
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_OSX})
108+
elseif("${CFLAGS_SDK}" STREQUAL "IOS" OR "${CFLAGS_SDK}" STREQUAL "IOS_SIMULATOR")
109+
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_IOS})
110+
elseif("${CFLAGS_SDK}" STREQUAL "TVOS" OR "${CFLAGS_SDK}" STREQUAL "TVOS_SIMULATOR")
111+
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_TVOS})
112+
elseif("${CFLAGS_SDK}" STREQUAL "WATCHOS" OR "${CFLAGS_SDK}" STREQUAL "WATCHOS_SIMULATOR")
113+
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_WATCHOS})
114+
endif()
115+
116+
if("${DEPLOYMENT_VERSION}" STREQUAL "")
117+
set(DEPLOYMENT_VERSION "${SWIFT_SDK_${CFLAGS_SDK}_DEPLOYMENT_VERSION}")
118+
endif()
119+
endif()
120+
103121
# MSVC and clang-cl don't understand -target.
104122
if (NOT SWIFT_COMPILER_IS_MSVC_LIKE)
105-
list(APPEND result "-target" "${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_TRIPLE}")
123+
list(APPEND result "-target" "${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_TRIPLE}${DEPLOYMENT_VERSION}")
106124
endif()
107125

108-
is_darwin_based_sdk("${CFLAGS_SDK}" IS_DARWIN)
109126
if(IS_DARWIN)
110127
list(APPEND result "-isysroot" "${SWIFT_SDK_${CFLAGS_SDK}_PATH}")
111128
elseif(NOT SWIFT_COMPILER_IS_MSVC_LIKE AND NOT "${SWIFT_SDK_${CFLAGS_SDK}_PATH}" STREQUAL "/")
@@ -120,21 +137,6 @@ function(_add_variant_c_compile_link_flags)
120137
endif()
121138

122139
if(IS_DARWIN)
123-
# Check if there's a specific OS deployment version needed for this invocation
124-
if("${CFLAGS_SDK}" STREQUAL "OSX")
125-
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_OSX})
126-
elseif("${CFLAGS_SDK}" STREQUAL "IOS" OR "${CFLAGS_SDK}" STREQUAL "IOS_SIMULATOR")
127-
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_IOS})
128-
elseif("${CFLAGS_SDK}" STREQUAL "TVOS" OR "${CFLAGS_SDK}" STREQUAL "TVOS_SIMULATOR")
129-
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_TVOS})
130-
elseif("${CFLAGS_SDK}" STREQUAL "WATCHOS" OR "${CFLAGS_SDK}" STREQUAL "WATCHOS_SIMULATOR")
131-
set(DEPLOYMENT_VERSION ${CFLAGS_DEPLOYMENT_VERSION_WATCHOS})
132-
endif()
133-
134-
if("${DEPLOYMENT_VERSION}" STREQUAL "")
135-
set(DEPLOYMENT_VERSION "${SWIFT_SDK_${CFLAGS_SDK}_DEPLOYMENT_VERSION}")
136-
endif()
137-
138140
list(APPEND result
139141
"-arch" "${CFLAGS_ARCH}"
140142
"-F" "${SWIFT_SDK_${CFLAGS_SDK}_PATH}/../../../Developer/Library/Frameworks"
@@ -297,16 +299,19 @@ function(_add_variant_swift_compile_flags
297299
list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_PATH}")
298300
endif()
299301

300-
if(BUILD_STANDALONE)
302+
is_darwin_based_sdk("${sdk}" IS_DARWIN)
303+
if(IS_DARWIN)
301304
list(APPEND result
302-
"-target" "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}")
305+
"-target" "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}${SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION}")
303306
else()
304307
list(APPEND result
305-
"-target" "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}"
306-
"-resource-dir" "${SWIFTLIB_DIR}")
308+
"-target" "${SWIFT_SDK_${sdk}_ARCH_${arch}_TRIPLE}")
309+
endif()
310+
311+
if(NOT BUILD_STANDALONE)
312+
list(APPEND result "-resource-dir" "${SWIFTLIB_DIR}")
307313
endif()
308314

309-
is_darwin_based_sdk("${sdk}" IS_DARWIN)
310315
if(IS_DARWIN)
311316
list(APPEND result
312317
"-F" "${SWIFT_SDK_${sdk}_PATH}/../../../Developer/Library/Frameworks")
@@ -2002,7 +2007,7 @@ function(_add_swift_executable_single name)
20022007
BINARY_DIR ${SWIFT_RUNTIME_OUTPUT_INTDIR}
20032008
LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})
20042009

2005-
target_link_libraries("${name}" ${SWIFTEXE_SINGLE_LINK_LIBRARIES} ${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES})
2010+
target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES} ${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES})
20062011
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_COMPONENT_DEPENDS})
20072012

20082013
set_target_properties(${name}

‎cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ macro(configure_sdk_darwin
123123

124124
foreach(arch ${architectures})
125125
set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
126-
"${arch}-apple-${SWIFT_SDK_${prefix}_TRIPLE_NAME}${SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION}")
126+
"${arch}-apple-${SWIFT_SDK_${prefix}_TRIPLE_NAME}")
127127
endforeach()
128128

129129
# Add this to the list of known SDKs.
@@ -141,7 +141,7 @@ macro(configure_sdk_unix
141141
set(SWIFT_SDK_${prefix}_PATH "${sdkpath}")
142142
set(SWIFT_SDK_${prefix}_VERSION "don't use")
143143
set(SWIFT_SDK_${prefix}_BUILD_NUMBER "don't use")
144-
set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "don't use")
144+
set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "")
145145
set(SWIFT_SDK_${prefix}_LIB_SUBDIR "${lib_subdir}")
146146
set(SWIFT_SDK_${prefix}_VERSION_MIN_NAME "")
147147
set(SWIFT_SDK_${prefix}_TRIPLE_NAME "${triple_name}")
@@ -171,7 +171,7 @@ macro(configure_sdk_windows prefix sdk_name environment architectures)
171171
set(SWIFT_SDK_${prefix}_PATH "/")
172172
set(SWIFT_SDK_${prefix}_VERSION "NOTFOUND")
173173
set(SWIFT_SDK_${prefix}_BUILD_NUMBER "NOTFOUND")
174-
set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "NOTFOUND")
174+
set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "")
175175
set(SWIFT_SDK_${prefix}_LIB_SUBDIR "windows")
176176
set(SWIFT_SDK_${prefix}_VERSION_MIN_NAME "NOTFOUND")
177177
set(SWIFT_SDK_${prefix}_TRIPLE_NAME "Win32")

‎cmake/modules/SwiftSharedCMakeConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ function(swift_common_llvm_config target)
309309
else()
310310
# HACK: Otherwise (for example, for executables), use a plain signature,
311311
# because LLVM CMake does that already.
312-
target_link_libraries("${target}" ${libnames})
312+
target_link_libraries("${target}" PRIVATE ${libnames})
313313
endif()
314314
else()
315315
# If Swift was not built standalone, dispatch to 'llvm_config()'.

‎include/swift/AST/ConcreteDeclRef.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ConcreteDeclRef {
7171

7272
llvm::PointerUnion<ValueDecl *, SpecializedDeclRef *> Data;
7373

74-
friend class llvm::PointerLikeTypeTraits<ConcreteDeclRef>;
74+
friend struct llvm::PointerLikeTypeTraits<ConcreteDeclRef>;
7575

7676
public:
7777
/// Create an empty declaration reference.
@@ -140,7 +140,7 @@ class ConcreteDeclRef {
140140
} // end namespace swift
141141

142142
namespace llvm {
143-
template<> class PointerLikeTypeTraits<swift::ConcreteDeclRef> {
143+
template<> struct PointerLikeTypeTraits<swift::ConcreteDeclRef> {
144144
typedef llvm::PointerUnion<swift::ValueDecl *,
145145
swift::ConcreteDeclRef::SpecializedDeclRef *>
146146
DataPointer;

‎include/swift/AST/Identifier.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ namespace llvm {
191191
};
192192

193193
// An Identifier is "pointer like".
194-
template<typename T> class PointerLikeTypeTraits;
194+
template<typename T> struct PointerLikeTypeTraits;
195195
template<>
196-
class PointerLikeTypeTraits<swift::Identifier> {
196+
struct PointerLikeTypeTraits<swift::Identifier> {
197197
public:
198198
static inline void *getAsVoidPointer(swift::Identifier I) {
199199
return const_cast<void *>(I.getAsOpaquePointer());
@@ -333,8 +333,8 @@ template<> struct DenseMapInfo<swift::DeclBaseName> {
333333
};
334334

335335
// A DeclBaseName is "pointer like".
336-
template <typename T> class PointerLikeTypeTraits;
337-
template <> class PointerLikeTypeTraits<swift::DeclBaseName> {
336+
template <typename T> struct PointerLikeTypeTraits;
337+
template <> struct PointerLikeTypeTraits<swift::DeclBaseName> {
338338
public:
339339
static inline void *getAsVoidPointer(swift::DeclBaseName D) {
340340
return const_cast<void *>(D.getAsOpaquePointer());
@@ -687,9 +687,9 @@ class ObjCSelector {
687687

688688
namespace llvm {
689689
// A DeclName is "pointer like".
690-
template<typename T> class PointerLikeTypeTraits;
690+
template<typename T> struct PointerLikeTypeTraits;
691691
template<>
692-
class PointerLikeTypeTraits<swift::DeclName> {
692+
struct PointerLikeTypeTraits<swift::DeclName> {
693693
public:
694694
static inline void *getAsVoidPointer(swift::DeclName name) {
695695
return name.getOpaqueValue();
@@ -717,9 +717,9 @@ namespace llvm {
717717
};
718718

719719
// An ObjCSelector is "pointer like".
720-
template<typename T> class PointerLikeTypeTraits;
720+
template<typename T> struct PointerLikeTypeTraits;
721721
template<>
722-
class PointerLikeTypeTraits<swift::ObjCSelector> {
722+
struct PointerLikeTypeTraits<swift::ObjCSelector> {
723723
public:
724724
static inline void *getAsVoidPointer(swift::ObjCSelector name) {
725725
return name.getOpaqueValue();

‎include/swift/AST/LayoutConstraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ template <> struct DenseMapInfo<swift::LayoutConstraint> {
395395
};
396396

397397
// A LayoutConstraint is "pointer like".
398-
template <> class PointerLikeTypeTraits<swift::LayoutConstraint> {
398+
template <> struct PointerLikeTypeTraits<swift::LayoutConstraint> {
399399
public:
400400
static inline void *getAsVoidPointer(swift::LayoutConstraint I) {
401401
return (void *)I.getPointer();

‎include/swift/AST/Type.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ namespace llvm {
674674

675675
// A Type is "pointer like".
676676
template<>
677-
class PointerLikeTypeTraits<swift::Type> {
677+
struct PointerLikeTypeTraits<swift::Type> {
678678
public:
679679
static inline void *getAsVoidPointer(swift::Type I) {
680680
return (void*)I.getPointer();
@@ -686,7 +686,7 @@ namespace llvm {
686686
};
687687

688688
template<>
689-
class PointerLikeTypeTraits<swift::CanType> :
689+
struct PointerLikeTypeTraits<swift::CanType> :
690690
public PointerLikeTypeTraits<swift::Type> {
691691
public:
692692
static inline swift::CanType getFromVoidPointer(void *P) {
@@ -695,7 +695,7 @@ namespace llvm {
695695
};
696696

697697
template<>
698-
class PointerLikeTypeTraits<swift::CanGenericSignature> {
698+
struct PointerLikeTypeTraits<swift::CanGenericSignature> {
699699
public:
700700
static inline swift::CanGenericSignature getFromVoidPointer(void *P) {
701701
return swift::CanGenericSignature((swift::GenericSignature*)P);

‎include/swift/AST/TypeAlignments.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ namespace llvm {
7272
}
7373
};
7474

75-
template <class T> class PointerLikeTypeTraits;
75+
template <class T> struct PointerLikeTypeTraits;
7676
}
7777

7878
/// Declare the expected alignment of pointers to the given type.
7979
/// This macro should be invoked from a top-level file context.
8080
#define LLVM_DECLARE_TYPE_ALIGNMENT(CLASS, ALIGNMENT) \
8181
namespace llvm { \
82-
template <> class PointerLikeTypeTraits<CLASS*> \
82+
template <> struct PointerLikeTypeTraits<CLASS*> \
8383
: public MoreAlignedPointerTraits<CLASS, ALIGNMENT> {}; \
8484
}
8585

‎include/swift/Basic/DiverseStack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ template <class T> class DiverseStackImpl : private DiverseStackBase {
378378
/// Allow stable_iterators to be put in things like TinyPtrVectors.
379379
namespace llvm {
380380
template <>
381-
class PointerLikeTypeTraits<
381+
struct PointerLikeTypeTraits<
382382
swift::DiverseStackBase::stable_iterator::AsPointer> {
383383
using AsPointer = swift::DiverseStackBase::stable_iterator::AsPointer;
384384
public:

‎include/swift/Basic/FlaggedPointer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class FlaggedPointer {
152152

153153
// Teach SmallPtrSet that FlaggedPointer is "basically a pointer".
154154
template <typename PointerTy, unsigned BitPosition, typename PtrTraits>
155-
class llvm::PointerLikeTypeTraits<
155+
struct llvm::PointerLikeTypeTraits<
156156
swift::FlaggedPointer<PointerTy, BitPosition, PtrTraits>> {
157157
public:
158158
static inline void *

‎include/swift/SIL/Dominance.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ namespace DomTreeBuilder {
3030
using SILDomTree = llvm::DomTreeBase<swift::SILBasicBlock>;
3131
using SILPostDomTree = llvm::PostDomTreeBase<swift::SILBasicBlock>;
3232

33-
extern template void Calculate<SILDomTree, swift::SILFunction>(
34-
SILDomTree &DT, swift::SILFunction &F);
35-
extern template void Calculate<SILPostDomTree, swift::SILFunction>(
36-
SILPostDomTree &DT, swift::SILFunction &F);
33+
extern template void Calculate<SILDomTree>(SILDomTree &DT);
34+
extern template void Calculate<SILPostDomTree>(SILPostDomTree &DT);
3735
} // namespace DomTreeBuilder
3836
} // namespace llvm
3937

‎include/swift/SIL/SILInstruction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class SILInstructionResultArray {
166166
reverse_range getReversedValues() const;
167167

168168
using type_range = llvm::iterator_range<
169-
llvm::mapped_iterator<iterator, std::function<SILType(SILValue)>>>;
169+
llvm::mapped_iterator<iterator, std::function<SILType(SILValue)>, SILType>>;
170170
type_range getTypes() const;
171171

172172
bool operator==(const SILInstructionResultArray &rhs);

‎include/swift/SIL/SILNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ struct cast_convert_val<To, const swift::SILNode, From>;
544544
/// ValueBase * is always at least eight-byte aligned; make the three tag bits
545545
/// available through PointerLikeTypeTraits.
546546
template<>
547-
class PointerLikeTypeTraits<swift::SILNode *> {
547+
struct PointerLikeTypeTraits<swift::SILNode *> {
548548
public:
549549
static inline void *getAsVoidPointer(swift::SILNode *I) {
550550
return (void*)I;

‎include/swift/SIL/SILType.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ namespace llvm {
615615
// Allow the low bit of SILType to be used for nefarious purposes, e.g. putting
616616
// a SILType into a PointerUnion.
617617
template<>
618-
class PointerLikeTypeTraits<swift::SILType> {
618+
struct PointerLikeTypeTraits<swift::SILType> {
619619
public:
620620
static inline void *getAsVoidPointer(swift::SILType T) {
621621
return T.getOpaqueValue();

‎include/swift/SIL/SILValue.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ namespace llvm {
272272
/// ValueBase * is always at least eight-byte aligned; make the three tag bits
273273
/// available through PointerLikeTypeTraits.
274274
template<>
275-
class PointerLikeTypeTraits<swift::ValueBase *> {
275+
struct PointerLikeTypeTraits<swift::ValueBase *> {
276276
public:
277277
static inline void *getAsVoidPointer(swift::ValueBase *I) {
278278
return (void*)I;
@@ -627,7 +627,7 @@ namespace llvm {
627627
};
628628

629629
/// SILValue is a PointerLikeType.
630-
template<> class PointerLikeTypeTraits<::swift::SILValue> {
630+
template<> struct PointerLikeTypeTraits<::swift::SILValue> {
631631
using SILValue = ::swift::SILValue;
632632
public:
633633
static void *getAsVoidPointer(SILValue v) {

‎lib/Basic/Platform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
113113
case llvm::Triple::RTEMS:
114114
case llvm::Triple::NaCl:
115115
case llvm::Triple::CNK:
116-
case llvm::Triple::Bitrig:
117116
case llvm::Triple::AIX:
118117
case llvm::Triple::CUDA:
119118
case llvm::Triple::NVCL:
120119
case llvm::Triple::AMDHSA:
121120
case llvm::Triple::ELFIAMCU:
122121
case llvm::Triple::Mesa3D:
123122
case llvm::Triple::Contiki:
123+
case llvm::Triple::AMDPAL:
124124
return "";
125125
case llvm::Triple::Darwin:
126126
case llvm::Triple::MacOSX:

‎lib/ClangImporter/ClangAdapter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ OmissionTypeName importer::getClangTypeNameForOmission(clang::ASTContext &ctx,
337337
// FIXME: Types that can be mapped, but aren't yet.
338338
case clang::BuiltinType::Half:
339339
case clang::BuiltinType::LongDouble:
340+
case clang::BuiltinType::Float16:
340341
case clang::BuiltinType::Float128:
341342
case clang::BuiltinType::NullPtr:
342343
return OmissionTypeName();

‎lib/ClangImporter/ClangImporter.cpp

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -406,27 +406,6 @@ void ClangImporter::clearTypeResolver() {
406406

407407
#define SHIMS_INCLUDE_FLAG "-isystem"
408408

409-
static StringRef
410-
getMinVersionOptNameForDarwinTriple(const llvm::Triple &triple) {
411-
switch(getDarwinPlatformKind(triple)) {
412-
case DarwinPlatformKind::MacOS:
413-
return "-mmacosx-version-min=";
414-
case DarwinPlatformKind::IPhoneOS:
415-
return "-mios-version-min=";
416-
case DarwinPlatformKind::IPhoneOSSimulator:
417-
return "-mios-simulator-version-min=";
418-
case DarwinPlatformKind::TvOS:
419-
return "-mtvos-version-min=";
420-
case DarwinPlatformKind::TvOSSimulator:
421-
return "-mtvos-simulator-version-min=";
422-
case DarwinPlatformKind::WatchOS:
423-
return "-mwatchos-version-min=";
424-
case DarwinPlatformKind::WatchOSSimulator:
425-
return "-mwatchos-simulator-version-min=";
426-
}
427-
llvm_unreachable("Unsupported Darwin platform");
428-
}
429-
430409
static void
431410
getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
432411
ASTContext &ctx,
@@ -659,24 +638,6 @@ addCommonInvocationArguments(std::vector<std::string> &invocationArgStrs,
659638
invocationArgStrs.push_back("-target");
660639
invocationArgStrs.push_back(triple.str());
661640

662-
if (triple.isOSDarwin()) {
663-
std::string minVersionBuf;
664-
llvm::raw_string_ostream minVersionOpt{minVersionBuf};
665-
minVersionOpt << getMinVersionOptNameForDarwinTriple(triple);
666-
667-
unsigned major, minor, micro;
668-
if (triple.isiOS()) {
669-
triple.getiOSVersion(major, minor, micro);
670-
} else if (triple.isWatchOS()) {
671-
triple.getWatchOSVersion(major, minor, micro);
672-
} else {
673-
assert(triple.isMacOSX());
674-
triple.getMacOSXVersion(major, minor, micro);
675-
}
676-
minVersionOpt << clang::VersionTuple(major, minor, micro);
677-
invocationArgStrs.push_back(std::move(minVersionOpt.str()));
678-
}
679-
680641
invocationArgStrs.push_back(ImporterImpl::moduleImportBufferName);
681642

682643
if (ctx.LangOpts.EnableAppExtensionRestrictions) {

0 commit comments

Comments
 (0)