Update the Swift version to 6.0! #71707

Don't use `#cmakedefine` to define values that can be zero. `#cmakedefine` only sets the definition when the corresponding value in CMake itself has a truthy value. `0` has a false-y value, so SWIFT_VERSION_MINOR is undefined for 6.0 resulting in some things breaking.

etcwilde · 2024-02-20T02:55:05Z

@swift-ci please test

shahmishal · 2024-02-20T06:33:03Z

swiftlang/swift-experimental-string-processing#722

@swift-ci test

shahmishal · 2024-02-20T07:07:36Z

swiftlang/swift-experimental-string-processing#722

@swift-ci build toolchain

compnerd · 2024-02-20T17:52:36Z

CC @compnerd, do we need to update the swift5 section names in https://github.com/apple/swift/blob/main/stdlib/public/runtime/SwiftRT-ELF-WASM.cpp and https://github.com/apple/swift/blob/main/stdlib/public/runtime/SwiftRT-COFF.cpp?

We can rename swift5 section names for ABI unstable platforms, but it's not mandatory

I don't think that we should. It would be an unnecessary break. If there was a motivation for doing this, e.g. we are changing the contents of the linker tables, then perhaps. Otherwise, I think that bumping the version is really unnecessary. Particularly on non-Darwin, the collection itself is versioned so that we can continue to add tables without changing the contents. So, even in the case where we want to change the contents, I think that we have other means.

cmake/SwiftVersion.cmake

lorentey

Looks good! 🚢

shahmishal · 2024-02-21T05:06:09Z

swiftlang/swift-experimental-string-processing#722

@swift-ci test

shahmishal · 2024-02-21T20:41:18Z

swiftlang/swift-experimental-string-processing#722

@swift-ci test

… match Swift version 5.10

shahmishal · 2024-02-22T00:20:25Z

swiftlang/swift-experimental-string-processing#722

@swift-ci test

shahmishal · 2024-02-22T08:19:49Z

swiftlang/swift-experimental-string-processing#722

@swift-ci build toolchain

This is a follow up to a corresponding toolchain PR swiftlang/swift#71707.

finagolfin · 2024-08-07T08:13:10Z

include/swift/Basic/LangOptions.h

@@ -171,7 +171,7 @@ namespace swift {
    ///

    /// User-overridable language version to compile for.
-    version::Version EffectiveLanguageVersion = version::Version::getCurrentLanguageVersion();
+    version::Version EffectiveLanguageVersion = version::Version{5, 10};


@shahmishal, do you plan to bump this to 6 soon? Otherwise, I'm seeing strange behavior like this when compiling code with the Swift 6 snapshots:

> cat check.swift #if swift(>=6.0) print("got to 6.0") #else print("no go to 6.0") #endif > ./swift-DEVELOPMENT-SNAPSHOT-2024-07-29-a-ubi9/usr/bin/swiftc check.swift && ./check no go to 6.0 > ./swift-6.0-DEVELOPMENT-SNAPSHOT-2024-08-02-a-ubi9/usr/bin/swiftc check.swift && ./check no go to 6.0

Of course, this can be worked around by explicitly setting the language version:

> ./swift-DEVELOPMENT-SNAPSHOT-2024-07-29-a-ubi9/usr/bin/swiftc check.swift -swift-version 6 && ./check got to 6.0

This is expected, the Swift 6.0 language mode is not enabled by default. Developers are required to enable Swift 6 language mode by using -swift-version 6.0

https://www.swift.org/migration

Important
The Swift 6 language mode is opt-in. Existing projects will not switch to this mode without configuration changes.

OK, I now see this was discussed on the forum months ago, which I missed: I will ask about it there.

shahmishal requested review from a team, ahoppen, bnbarham, hamishknight, rintaro, zoecarver, hyp, egorzhdan, ktoso, phausler, artemcm, hborla, slavapestov and xedin as code owners February 17, 2024 18:03

Azoy approved these changes Feb 17, 2024

View reviewed changes

hborla approved these changes Feb 17, 2024

View reviewed changes

include/swift/AST/ASTContext.h Outdated Show resolved Hide resolved

shahmishal force-pushed the bump-swift-version-to-6 branch from fe4a425 to e8addf5 Compare February 17, 2024 18:33

hborla mentioned this pull request Feb 19, 2024

Normalize 'Swift 6.0' to 'Swift 6' to match formatting of Swift 3, 4, 5. swiftlang/swift-evolution#2328

Closed

Update the Swift version to 6.0 from 5.11

af112c1

shahmishal force-pushed the bump-swift-version-to-6 branch from e8addf5 to af112c1 Compare February 20, 2024 01:48

Set the default compiler effective language version to Swift 5 for now

2173c52

shahmishal force-pushed the bump-swift-version-to-6 branch from 19d6595 to 2173c52 Compare February 20, 2024 06:28

shahmishal mentioned this pull request Feb 20, 2024

[swift/main] Update the Swift version to 6.0 swiftlang/swift-experimental-string-processing#722

Merged

Harry-KNIGHT reviewed Feb 20, 2024

View reviewed changes

cmake/SwiftVersion.cmake Show resolved Hide resolved

ahoppen removed their request for review February 20, 2024 22:05

shahmishal added 2 commits February 20, 2024 14:30

Fix the Serialization/version-mismatches.swift Swift version

a19021d

Merge remote-tracking branch 'origin/main' into bump-swift-version-to-6

96d61d3

lorentey approved these changes Feb 20, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into bump-swift-version-to-6

b488702

shahmishal and others added 2 commits February 21, 2024 12:37

Set the minor version to 10 (5.10) for language version

9a1d86c

Merge branch 'main' into bump-swift-version-to-6

b8cd763

etcwilde approved these changes Feb 21, 2024

View reviewed changes

shahmishal added 2 commits February 21, 2024 15:20

Update the SwiftStdlib version to 6.0 and fix Frontend/crash.swift test

6c306e3

Fix the test/Serialization/Recovery/types-5-to-4.swift test string to…

cc69963

… match Swift version 5.10

Merge remote-tracking branch 'origin/main' into bump-swift-version-to-6

cb96ec2

shahmishal merged commit c7c3eb2 into main Feb 22, 2024

shahmishal deleted the bump-swift-version-to-6 branch February 22, 2024 17:45

MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Feb 23, 2024

Replace 5.11 version with 6.0 in the code base

c2077ba

This is a follow up to a corresponding toolchain PR swiftlang/swift#71707.

MaxDesiatov mentioned this pull request Feb 23, 2024

Replace 5.11 version with 6.0 in the code base swiftlang/swift-package-manager#7361

Merged

MaxDesiatov added a commit to swiftlang/swift-package-manager that referenced this pull request Feb 23, 2024

Replace 5.11 version with 6.0 in the code base (#7361)

d7878b0

This is a follow up to a corresponding toolchain PR swiftlang/swift#71707.

furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024

Replace 5.11 version with 6.0 in the code base (swiftlang#7361)

691d57c

This is a follow up to a corresponding toolchain PR swiftlang/swift#71707.

furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024

Replace 5.11 version with 6.0 in the code base (swiftlang#7361)

e1bdb02

This is a follow up to a corresponding toolchain PR swiftlang/swift#71707.

finagolfin reviewed Aug 7, 2024

View reviewed changes

Update the Swift version to 6.0! #71707

Update the Swift version to 6.0! #71707

Uh oh!

Conversation

shahmishal commented Feb 17, 2024

Uh oh!

shahmishal commented Feb 17, 2024

Uh oh!

shahmishal commented Feb 17, 2024

Uh oh!

Azoy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shahmishal commented Feb 17, 2024

Uh oh!

shahmishal commented Feb 17, 2024

Uh oh!

shahmishal commented Feb 17, 2024

Uh oh!

etcwilde commented Feb 19, 2024

Uh oh!

MaxDesiatov commented Feb 19, 2024

Uh oh!

shahmishal commented Feb 20, 2024

Uh oh!

etcwilde commented Feb 20, 2024

Uh oh!

shahmishal commented Feb 20, 2024

Uh oh!

shahmishal commented Feb 20, 2024

Uh oh!

compnerd commented Feb 20, 2024

Uh oh!

Uh oh!

lorentey left a comment

Choose a reason for hiding this comment

Uh oh!

shahmishal commented Feb 21, 2024

Uh oh!

shahmishal commented Feb 21, 2024

Uh oh!

shahmishal commented Feb 22, 2024

Uh oh!

shahmishal commented Feb 22, 2024

Uh oh!

finagolfin Aug 7, 2024

Choose a reason for hiding this comment

Uh oh!

shahmishal Aug 7, 2024

Choose a reason for hiding this comment

Uh oh!

finagolfin Aug 8, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!