averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into manually-merge-main

Browse Source
This commit is contained in:
Ben Barham
2022-05-25 15:55:35 -07:00
parent c2a36ab9da aefec8d3b8
commit 92b6dd24c2
67 changed files with 1200 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/Basic/LangOptions.h
View File

@@ -326,10 +326,6 @@ namespace swift {
/// in calls to generic functions.
bool EnableOpenedExistentialTypes = false;
/// Enable support for parameterized protocol types in existential
/// position.
bool EnableParameterizedExistentialTypes = false;
/// Enable experimental flow-sensitive concurrent captures.
bool EnableExperimentalFlowSensitiveConcurrentCaptures = false;

7
include/swift/Basic/Version.h
View File

@@ -129,7 +129,12 @@ public:
/// Return this Version struct as the appropriate version string for APINotes.
std::string asAPINotesVersionString() const;
/// Parse a version in the form used by the _compiler_version \#if condition.
/// Parse a version in the form used by the _compiler_version(string-literal)
/// \#if condition.
///
/// \note This is \em only used for the string literal version, so it includes
/// backwards-compatibility logic to convert it to something that can be
/// compared with a modern SWIFT_COMPILER_VERSION.
static Optional<Version> parseCompilerVersionString(StringRef VersionString,
SourceLoc Loc,
DiagnosticEngine *Diags);