[Typechecker] Relax the check only for non-final classes

Author: theblixguy

lib/Sema/TypeCheckConstraints.cpp

@@ -4299,12 +4299,20 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
     //   }
     // }
     //
-    // Note: we relax the restriction if the type we're casting to is a class
-    // because it's possible that we might have a subclass that conforms to
-    // the protocol.
-    if (fromExistential && !toType->hasReferenceSemantics()) {
+    // Note: we relax the restriction if the type we're casting to is a
+    // non-final class because it's possible that we might have a subclass
+    // that conforms to the protocol.
+    if (fromExistential && !toExistential) {
       if (auto NTD = toType->getAnyNominal()) {
-        if (!isa<ProtocolDecl>(NTD)) {
+        bool shouldContinue = true;
+
+        // If we have a non-final class, then don't check
+        if (toType->is<ClassType>() && !NTD->isFinal()) {
+          shouldContinue = false;
+        }
+
+        // Otherwise, check the cast.
+        if (shouldContinue) {
           auto protocolDecl =
               dyn_cast_or_null<ProtocolDecl>(fromType->getAnyNominal());
           if (protocolDecl &&

test/Constraints/patterns.swift

@@ -55,7 +55,7 @@ case is B,
      is D,
      is S:
   ()
-case is E: // expected-warning {{cast from 'P' to unrelated type 'E' always fails}}
+case is E:
   ()
 default:
   ()
@@ -69,7 +69,7 @@ case let d as D:
   d.d()
 case let s as S:
   s.s()
-case let e as E: // expected-warning {{cast from 'P' to unrelated type 'E' always fails}}
+case let e as E:
   e.e()
 default:
   ()

test/stmt/errors.swift

@@ -209,16 +209,16 @@ class SR_6400_B: SR_6400_FakeApplicationDelegate & Error {}
 func sr_6400_4() {
   do {
     throw SR_6400_E.castError
-  } catch let error as SR_6400_A { // expected-warning {{immutable value 'error' was never used; consider replacing with '_' or removing it}}
-    print("Foo")
+  } catch let error as SR_6400_A { // Okay
+    print(error)
   } catch {
     print("Bar")
   }
 
   do {
     throw SR_6400_E.castError
-  } catch let error as SR_6400_B { // expected-warning {{immutable value 'error' was never used; consider replacing with '_' or removing it}}
-    print("Foo")
+  } catch let error as SR_6400_B { // Okay
+    print(error)
   } catch {
     print("Bar")
   }
@@ -230,10 +230,16 @@ protocol SR_11402_P {}
 class SR_11402_Superclass {}
 class SR_11402_Subclass: SR_11402_Superclass, SR_11402_P {}
 
-func sr_11402_func(_ x: SR_11402_P) {
+func sr_11402_func1(_ x: SR_11402_P) {
   if let y = x as? SR_11402_Superclass { // Okay
     print(y)
   }
 }
 
-sr_11402_func(SR_11402_Subclass())
+final class SR_11402_Final {}
+
+func sr_11402_func2(_ x: SR_11402_P) {
+  if let y = x as? SR_11402_Final { // expected-error {{cast from 'SR_11402_P' to unrelated type 'SR_11402_Final' always fails}}
+    print(y)
+  }
+}