Merge pull request #17497 from rudkx/rdar40955755

[TypeChecker] Fix crash with Objective C keypaths.

Author: rudkx

lib/Sema/CSGen.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -3280,7 +3280,8 @@ namespace {
       if (auto keyPath = dyn_cast<KeyPathExpr>(expr)) {
         if (keyPath->isObjC()) {
           auto &cs = CG.getConstraintSystem();
-          (void)cs.getTypeChecker().checkObjCKeyPathExpr(cs.DC, keyPath);
+          if (!cs.getTypeChecker().checkObjCKeyPathExpr(cs.DC, keyPath))
+            return { false, nullptr };
         }
       }
 

lib/Sema/TypeCheckExprObjC.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -317,6 +317,10 @@ Optional<Type> TypeChecker::checkObjCKeyPathExpr(DeclContext *dc,
     // Handle property references.
     if (auto var = dyn_cast<VarDecl>(found)) {
       validateDecl(var);
+      if (var->isInvalid() || !var->hasInterfaceType() ||
+          var->getInterfaceType()->hasError()) {
+        return None;
+      }
 
       // Resolve this component to the variable we found.
       auto varRef = ConcreteDeclRef(var);

test/expr/primary/keypath/keypath-objc.swift

@@ -4,7 +4,7 @@ import Foundation
 
 // REQUIRES: objc_interop
 
-@objc class A : NSObject {
+@objc class A : NSObject { // expected-error {{class 'A' has no initializers}}
   @objc var propB: B = B()
   @objc var propString: String = "" // expected-note {{did you mean 'propString'}}
   @objc var propArray: [String] = []
@@ -21,6 +21,8 @@ import Foundation
   @objc func someMethod() { }
 
   @objc var `repeat`: String?
+
+  @objc var noType // expected-error {{type annotation missing in pattern}}
 }
 
 @objc class B : NSObject  {
@@ -106,6 +108,9 @@ func testKeyPath(a: A, b: B) {
   // Property with keyword name.
   let _: String = #keyPath(A.repeat)
 
+  // Property with no type
+  let _: String = #keyPath(A.noType)
+
   // Nested type of a bridged type (rdar://problem/28061409).
   typealias IntArray = [Int]
   let _: String = #keyPath(IntArray.Foo.propString)