Remove support for -swift-version 3 from the expression type checker. #17691

rudkx · 2018-07-03T01:41:56Z

This is the obvious stuff. There will probably be more fallout.

rudkx · 2018-07-03T01:42:30Z

There are no test changes here, just updates to the code, so this won't pass tests.

Waiting on #17689 and any other test and source compatibility updates before merging.

rudkx · 2018-07-03T02:06:03Z

@swift-ci Please smoke test

slavapestov

Nice work. If you don't mind, can you please remove the dead diagnostics now also?

slavapestov · 2018-07-03T02:56:55Z

lib/Sema/CSApply.cpp

-                                       dc, SourceLoc(), sub, SourceRange())
-                 == CheckedCastKind::Swift3BridgingDowncast) {
-          tc.diagnose(expr->getLoc(),
-                      diag::missing_forced_downcast_swift3_compat_warning,


Remove "missing_forced_downcast_swift3_compat_warning"

slavapestov · 2018-07-03T02:58:18Z

lib/Sema/MiscDiagnostics.cpp

-      // parameter.
-      auto params = FT->getParams();
-      if (params.size() > 1) {
-        TC.diagnose(Call->getLoc(), diag::tuple_splat_use, params.size())


Remove "tuple_splat_use"

slavapestov · 2018-07-03T02:58:30Z

lib/Sema/MiscDiagnostics.cpp

@@ -676,9 +641,7 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,

      // In Swift 3, this is just a warning.
      TC.diagnose(apply->getLoc(),
-                  TC.Context.isSwiftVersion3()
-                    ? diag::warn_noescape_param_call


Remove "warn_noescape_param_call"

slavapestov · 2018-07-03T02:58:39Z

lib/Sema/MiscDiagnostics.cpp

@@ -741,36 +704,6 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,

    // Swift 3 mode produces a warning + Fix-It for the missing ".self"


Remove this comment

slavapestov · 2018-07-03T02:58:50Z

lib/Sema/MiscDiagnostics.cpp

@@ -797,19 +730,6 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,
        }
      }

-      if (shouldWarnOnMissingSelf(E)) {
-        auto diag = TC.diagnose(E->getEndLoc(),
-                                diag::warn_value_of_metatype_missing_self,


Remove "warn_value_of_metatype_missing_self"

rudkx · 2018-07-03T05:09:23Z

@slavapestov I think I took care of the things you mentioned.

slavapestov · 2018-07-03T05:25:05Z

@rudkx Thanks! My PR that you linked to is now merged. This LGTM, but I suspect it will break the source compat suite.

slavapestov

One more nitpick

slavapestov · 2018-07-03T05:40:48Z

lib/Sema/CSApply.cpp

@@ -6545,7 +6501,7 @@ Expr *ExprRewriter::coerceToType(Expr *expr, Type toType,
      // ```
      //
      // See also: https://bugs.swift.org/browse/SR-6796
-      if (cs.getASTContext().isSwiftVersionAtLeast(3) &&
+      if (cs.getASTContext().isSwiftVersionAtLeast(4) &&


Isn’t the first part always true? It should suffice to just check if you’re < 5

That was intentional. If there are tests passing -swift-version 3 explicitly they should break if they are relying on this behavior. You might have removed all of those with your PR, though.

rudkx · 2018-07-03T19:27:44Z

@swift-ci Please test source compatibility

rudkx · 2018-07-04T00:48:11Z

@swift-ci Please smoke test

rudkx · 2018-07-04T01:43:13Z

@swift-ci Please smoke test

rudkx · 2018-07-04T01:51:31Z

@nathawes FYI, I'm removing a few migrator tests here that don't make sense with Swift 3 support removed from the expression type checker.

@benlangmuir I'm not sure what's going on with the code completion test. I'll take a look at it, but in the mean time do you have any idea why removing support for some Swift 3 compatibility hacks would have an impact here?

rudkx · 2018-07-04T19:44:34Z

I've split all the test updates out into #17748.

rudkx · 2018-07-04T20:10:30Z

Please test with following PR:
#17748

@swift-ci Please smoke test

rudkx · 2018-07-04T20:11:32Z

Please test with following PR:
swiftlang/swift-source-compat-suite#197

@swift-ci Please test source compatibility

rudkx · 2018-07-04T22:41:16Z

Hmmm, neither of my "test with" seems to have actually tested with. I guess testing with another PR from the same repo might not be supported, but I don't know what's up with the source compatibility suite.

rudkx · 2018-07-05T04:03:15Z

@swift-ci Please smoke test

rudkx · 2018-07-05T06:45:53Z

Please test with following pull request:
swiftlang/swift-source-compat-suite#197

@swift-ci Please test source compatibility

This is the obvious stuff. There will probably be more fallout.

rudkx · 2018-07-06T23:12:29Z

@swift-ci Please smoke test

rudkx · 2018-07-09T21:52:13Z

@swift-ci Please test source compatibility

rudkx · 2018-07-12T06:50:32Z

@swift-ci Please smoke test

rudkx · 2018-07-12T06:50:38Z

@swift-ci Please test source compatibility

rudkx · 2018-07-12T14:48:39Z

Source compatibility failures in 3.x configs:

Kickstarter-ReactiveExtensions
ReactiveCocoa
RxDataSources
Starscream

rudkx · 2018-07-12T16:22:07Z

@swift-ci Please smoke test

rudkx · 2018-07-12T17:11:58Z

@swift-ci build toolchain

rudkx · 2018-07-12T22:35:25Z

Linux test failure is unrelated to my changes: TestFoundation/TestProcess.swift:410: error: TestProcess.test_preStartEndState : XCTAssertEqual failed: ("exit") is not equal to ("uncaughtSignal") -

rudkx · 2018-07-12T22:35:34Z

@swift-ci Please smoke test Linux platform

rudkx · 2018-07-14T23:28:40Z

@swift-ci Please smoke test

rudkx · 2018-07-14T23:28:54Z

@swift-ci Please test source compatibility

rudkx · 2018-07-15T00:30:46Z

@swift-ci Please test source compatibility

rudkx · 2018-07-15T00:30:54Z

@swift-ci Please smoke test

slavapestov reviewed Jul 3, 2018

View reviewed changes

hamishknight mentioned this pull request Jul 3, 2018

[Sema][GSB] Warn about redundant ': Any' conformances & constraints #17425

Closed

rudkx mentioned this pull request Jul 4, 2018

Remove tests that fail with Swift 3 expression type checking support … swiftlang/swift-source-compat-suite#197

Closed

rudkx requested review from nathawes and benlangmuir July 4, 2018 01:43

Remove support for -swift-version 3 from the expression type checker.

28f759c

This is the obvious stuff. There will probably be more fallout.

rudkx added 2 commits July 11, 2018 20:55

Merge branch 'master' into remove-swift-3-in-expr-typechecking

aa30cc5

Merge branch 'master' into remove-swift-3-in-expr-typechecking

efb1738

Silence a couple release build warnings about unused variables.

a5a1a63

rudkx mentioned this pull request Jul 13, 2018

Temporarily remove Kickstarter-ReactiveExtensions and RxDataSources. swiftlang/swift-source-compat-suite#219

Merged

rudkx merged commit eb57e20 into swiftlang:master Jul 15, 2018

rudkx deleted the remove-swift-3-in-expr-typechecking branch July 15, 2018 02:04

		@@ -741,36 +704,6 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,

		// Swift 3 mode produces a warning + Fix-It for the missing ".self"

Remove support for -swift-version 3 from the expression type checker. #17691

Remove support for -swift-version 3 from the expression type checker. #17691

Conversation

rudkx commented Jul 3, 2018

rudkx commented Jul 3, 2018 • edited Loading

rudkx commented Jul 3, 2018

slavapestov left a comment

Choose a reason for hiding this comment

slavapestov Jul 3, 2018

Choose a reason for hiding this comment

slavapestov Jul 3, 2018

Choose a reason for hiding this comment

slavapestov Jul 3, 2018

Choose a reason for hiding this comment

slavapestov Jul 3, 2018

Choose a reason for hiding this comment

slavapestov Jul 3, 2018

Choose a reason for hiding this comment

rudkx commented Jul 3, 2018

slavapestov commented Jul 3, 2018

slavapestov left a comment

Choose a reason for hiding this comment

slavapestov Jul 3, 2018

Choose a reason for hiding this comment

rudkx Jul 3, 2018

Choose a reason for hiding this comment

rudkx commented Jul 3, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 4, 2018

rudkx commented Jul 5, 2018

rudkx commented Jul 5, 2018

rudkx commented Jul 6, 2018

rudkx commented Jul 9, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 12, 2018

rudkx commented Jul 14, 2018

rudkx commented Jul 14, 2018

rudkx commented Jul 15, 2018

rudkx commented Jul 15, 2018

rudkx commented Jul 3, 2018 •

edited

Loading