Merge pull request swiftlang#33486 from yersultan-17/dynamicmemberkeypathobjcstringfix

Added ObjC string for keypath argument of @dynamicmemberlookup

Author: beccadax

lib/Sema/CSApply.cpp

@@ -398,6 +398,26 @@ namespace {
       return base.getOldType();
     }
 
+    /// Check whether it is possible to have an ObjC key path string for the keypath expression
+    /// and set the key path string, if yes
+    void checkAndSetObjCKeyPathString(KeyPathExpr *keyPath) {
+      if (cs.getASTContext().LangOpts.EnableObjCInterop) {
+        SmallString<64> compatStringBuf;
+        if (buildObjCKeyPathString(keyPath, compatStringBuf)) {
+            auto stringCopy = cs.getASTContext().AllocateCopy<char>(compatStringBuf.begin(),
+                                                                    compatStringBuf.end());
+            auto stringExpr = new (cs.getASTContext()) StringLiteralExpr(
+                                  StringRef(stringCopy, compatStringBuf.size()),
+                                  SourceRange(),
+                                  /*implicit*/ true);
+            cs.setType(
+                stringExpr,
+                cs.getASTContext().getStringDecl()->getDeclaredInterfaceType());
+            keyPath->setObjCStringLiteralExpr(stringExpr);
+        }
+      }
+    }
+
     // Returns None if the AST does not contain enough information to recover
     // substitutions; this is different from an Optional(SubstitutionMap()),
     // indicating a valid call to a non-generic operator.
@@ -2041,6 +2061,11 @@ namespace {
       keyPath->setParsedPath(componentExpr);
       keyPath->resolveComponents(ctx, components);
       cs.cacheExprTypes(keyPath);
+
+      // See whether there's an equivalent ObjC key path string we can produce
+      // for interop purposes.
+      checkAndSetObjCKeyPathString(keyPath);
+
       return keyPath;
     }
 
@@ -4755,22 +4780,7 @@ namespace {
 
       // See whether there's an equivalent ObjC key path string we can produce
       // for interop purposes.
-      if (cs.getASTContext().LangOpts.EnableObjCInterop) {
-        SmallString<64> compatStringBuf;
-        if (buildObjCKeyPathString(E, compatStringBuf)) {
-          auto stringCopy =
-            cs.getASTContext().AllocateCopy<char>(compatStringBuf.begin(),
-                                                  compatStringBuf.end());
-          auto stringExpr = new (cs.getASTContext()) StringLiteralExpr(
-                                 StringRef(stringCopy, compatStringBuf.size()),
-                                 SourceRange(),
-                                 /*implicit*/ true);
-          cs.setType(
-              stringExpr,
-              cs.getASTContext().getStringDecl()->getDeclaredInterfaceType());
-          E->setObjCStringLiteralExpr(stringExpr);
-        }
-      }
+      checkAndSetObjCKeyPathString(E);
 
       // The final component type ought to line up with the leaf type of the
       // key path.

test/SILGen/keypaths_objc.swift

@@ -113,3 +113,47 @@ class OverrideFrameworkObjCProperty: A {
 func overrideFrameworkObjCProperty() {
   let _ = \OverrideFrameworkObjCProperty.counter
 }
+
+@dynamicMemberLookup
+class DynamicClass<Root> {
+    init() {}
+    subscript<T>(dynamicMember member: KeyPath<Root, T>) -> DynamicClass<T> {
+        fatalError()
+    }
+}
+
+// CHECK-LABEL: sil hidden [ossa] @{{.*}}dynamicMemberLookupSimple
+func dynamicMemberLookupSimple(foo: DynamicClass<Foo>, nonobjc: DynamicClass<NonObjC>) {
+  // CHECK: keypath $KeyPath<Foo, Bar>, (objc "bar"
+  _ = foo.bar
+  // CHECK: keypath $KeyPath<Foo, Int>, (objc "int"
+  _ = foo.int
+  // CHECK: keypath $KeyPath<Foo, Bar>, (objc "bar"
+  // CHECK: keypath $KeyPath<Bar, Foo>, (objc "foo"
+  _ = foo.bar.foo
+  // CHECK: keypath $KeyPath<Foo, NonObjC>, (root
+  _ = foo.nonobjc
+  // CHECK: keypath $KeyPath<Foo, Bar>, (objc "thisIsADifferentName"
+  _ = foo.differentName
+  // CHECK: keypath $KeyPath<NonObjC, Int>, (root
+  _ = nonobjc.x
+  // CHECK: keypath $KeyPath<NonObjC, NSObject>, (root
+   _ = nonobjc.y
+}
+
+// CHECK-LABEL: sil hidden [ossa] @{{.*}}dynamicMemberLookupNestedKeypaths
+func dynamicMemberLookupNestedKeypaths(foo: DynamicClass<Foo>) {
+  // CHECK: keypath $KeyPath<Foo, Bar>, (objc "bar" 
+  // CHECK: keypath $KeyPath<Bar, Foo>, (objc "foo" 
+  // CHECK: keypath $KeyPath<Foo, Bar>, (objc "bar" 
+  _ = foo.bar.foo.bar
+}
+
+// CHECK-LABEL: sil hidden [ossa] @{{.*}}dynamicMemberLookupMixedKeypaths
+func dynamicMemberLookupMixedKeypaths(foo: DynamicClass<Foo>) {
+  // CHECK: keypath $KeyPath<Foo, Bar>, (objc "bar"
+  // CHECK: keypath $KeyPath<Bar, Foo>, (objc "foo"
+  // CHECK: keypath $KeyPath<Foo, NonObjC>, (root
+  // CHECK: keypath $KeyPath<NonObjC, NSObject>, (root
+  _ = foo.bar.foo.nonobjc.y 
+}