Merge remote-tracking branch 'origin/master' into master-rebranch

swift-ci · swift-ci · commit 10d7479b62a2 · 2020-08-20T15:35:35.000-07:00
diff --git a/lib/PrintAsObjC/DeclAndTypePrinter.cpp b/lib/PrintAsObjC/DeclAndTypePrinter.cpp
@@ -1340,6 +1340,7 @@ class DeclAndTypePrinter::Implementation
     return true;
   }
 
+public:
   /// If \p nominal is bridged to an Objective-C class (via a conformance to
   /// _ObjectiveCBridgeable), return that class.
   ///
@@ -1370,6 +1371,7 @@ class DeclAndTypePrinter::Implementation
     return objcType->getClassOrBoundGenericClass();
   }
 
+private:
   /// If the nominal type is bridged to Objective-C (via a conformance
   /// to _ObjectiveCBridgeable), print the bridged type.
   void printObjCBridgeableType(const NominalTypeDecl *swiftNominal,
@@ -2068,6 +2070,14 @@ bool DeclAndTypePrinter::isEmptyExtensionDecl(const ExtensionDecl *ED) {
   return getImpl().isEmptyExtensionDecl(ED);
 }
 
+const TypeDecl *DeclAndTypePrinter::getObjCTypeDecl(const TypeDecl* TD) {
+  if (auto *nominal = dyn_cast<NominalTypeDecl>(TD))
+    if (auto *bridged = getImpl().getObjCBridgedClass(nominal))
+      return bridged;
+
+  return TD;
+}
+
 StringRef
 DeclAndTypePrinter::maybeGetOSObjectBaseName(const clang::NamedDecl *decl) {
   StringRef name = decl->getName();
diff --git a/lib/PrintAsObjC/DeclAndTypePrinter.h b/lib/PrintAsObjC/DeclAndTypePrinter.h
@@ -73,6 +73,14 @@ class DeclAndTypePrinter {
   /// Is \p ED empty of members and protocol conformances to include?
   bool isEmptyExtensionDecl(const ExtensionDecl *ED);
 
+  /// Returns the type that will be printed by PrintAsObjC for a parameter or
+  /// result type resolved to this declaration.
+  ///
+  /// \warning This handles \c _ObjectiveCBridgeable types, but it doesn't
+  /// currently know about other aspects of PrintAsObjC behavior, like known
+  /// types.
+  const TypeDecl *getObjCTypeDecl(const TypeDecl* TD);
+
   /// Prints a category declaring the given members.
   ///
   /// All members must have the same parent type. The list must not be empty.
diff --git a/lib/PrintAsObjC/ModuleContentsWriter.cpp b/lib/PrintAsObjC/ModuleContentsWriter.cpp
@@ -16,6 +16,7 @@
 
 #include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/Module.h"
+#include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/SwiftNameTranslation.h"
 #include "swift/AST/TypeDeclFinder.h"
@@ -236,6 +237,8 @@ class ModuleWriter {
   }
 
   bool forwardDeclareMemberTypes(DeclRange members, const Decl *container) {
+    PrettyStackTraceDecl
+        entry("printing forward declarations needed by members of", container);
     switch (container->getKind()) {
     case DeclKind::Class:
     case DeclKind::Protocol:
@@ -248,6 +251,7 @@ class ModuleWriter {
     bool hadAnyDelayedMembers = false;
     SmallVector<ValueDecl *, 4> nestedTypes;
     for (auto member : members) {
+      PrettyStackTraceDecl loopEntry("printing for member", member);
       auto VD = dyn_cast<ValueDecl>(member);
       if (!VD || !printer.shouldInclude(VD))
         continue;
@@ -270,9 +274,14 @@ class ModuleWriter {
       ReferencedTypeFinder::walk(VD->getInterfaceType(),
                                  [&](ReferencedTypeFinder &finder,
                                      const TypeDecl *TD) {
+        PrettyStackTraceDecl
+            entry("walking its interface type, currently at", TD);
         if (TD == container)
           return;
 
+        // Bridge, if necessary.
+        TD = printer.getObjCTypeDecl(TD);
+
         if (finder.needsDefinition() && isa<NominalTypeDecl>(TD)) {
           // We can delay individual members of classes; do so if necessary.
           if (isa<ClassDecl>(container)) {
diff --git a/lib/Sema/LookupVisibleDecls.cpp b/lib/Sema/LookupVisibleDecls.cpp
@@ -946,17 +946,22 @@ class OverrideFilteringConsumer : public VisibleDeclConsumer {
                         /*wouldConflictInSwift5*/nullptr,
                         /*skipProtocolExtensionCheck*/true)) {
           FoundConflicting = true;
-          // Prefer derived requirements over their witnesses.
-          if (Reason ==
-                DeclVisibilityKind::MemberOfProtocolDerivedByCurrentNominal ||
-              VD->getFormalAccess() > OtherVD->getFormalAccess() ||
-              //Prefer available one.
-              (!AvailableAttr::isUnavailable(VD) &&
-               AvailableAttr::isUnavailable(OtherVD))) {
-            FilteredResults.remove(
-                FoundDeclTy(OtherVD, DeclVisibilityKind::LocalVariable, {}));
-            FilteredResults.insert(DeclAndReason);
-            *I = VD;
+
+          if (!AvailableAttr::isUnavailable(VD)) {
+            bool preferVD = (
+                // Prefer derived requirements over their witnesses.
+                Reason == DeclVisibilityKind::
+                              MemberOfProtocolDerivedByCurrentNominal ||
+                // Prefer available one.
+                AvailableAttr::isUnavailable(OtherVD) ||
+                // Prefer more accessible one.
+                VD->getFormalAccess() > OtherVD->getFormalAccess());
+            if (preferVD) {
+              FilteredResults.remove(
+                  FoundDeclTy(OtherVD, DeclVisibilityKind::LocalVariable, {}));
+              FilteredResults.insert(DeclAndReason);
+              *I = VD;
+            }
           }
         }
       }
diff --git a/test/IDE/complete_rdar67155695.swift b/test/IDE/complete_rdar67155695.swift
@@ -0,0 +1,111 @@
+// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token=PUBLIC | %FileCheck %s --check-prefix=PUBLIC
+// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token=INTERNAL | %FileCheck %s --check-prefix=INTERNAL
+// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token=PRIVATE | %FileCheck %s --check-prefix=PRIVATE
+
+public protocol PubP {}
+
+public extension PubP {
+    func availableP_availableC() {}
+
+    func availableP_unavailableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_availableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_unavailableC() {}
+}
+
+struct TestForPubP: PubP {
+    func availableP_availableC() {}
+
+    @available(*, unavailable)
+    func availableP_unavailableC() {}
+
+    func unavailableP_availableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_unavailableC() {}
+}
+
+func test(val: TestForPubP) {
+    val.#^PUBLIC^#
+// PUBLIC: Begin completions, 4 items
+// PUBLIC-DAG: Keyword[self]/CurrNominal:          self[#TestForPubP#];
+// PUBLIC-DAG: Decl[InstanceMethod]/CurrNominal:   unavailableP_availableC()[#Void#];
+// PUBLIC-DAG: Decl[InstanceMethod]/Super:         availableP_availableC()[#Void#];
+// PUBLIC-DAG: Decl[InstanceMethod]/Super:         availableP_unavailableC()[#Void#];
+// PUBLIC: End completions
+}
+
+protocol InternalP {}
+
+extension InternalP {
+    func availableP_availableC() {}
+
+    func availableP_unavailableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_availableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_unavailableC() {}
+}
+
+struct TestForInternalP: InternalP {
+    func availableP_availableC() {}
+
+    @available(*, unavailable)
+    func availableP_unavailableC() {}
+
+    func unavailableP_availableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_unavailableC() {}
+}
+
+func test(val: TestForInternalP) {
+    val.#^INTERNAL^#
+// INTERNAL: Begin completions, 4 items
+// INTERNAL-DAG: Keyword[self]/CurrNominal:          self[#TestForInternalP#];
+// INTERNAL-DAG: Decl[InstanceMethod]/CurrNominal:   availableP_availableC()[#Void#];
+// INTERNAL-DAG: Decl[InstanceMethod]/CurrNominal:   unavailableP_availableC()[#Void#];
+// INTERNAL-DAG: Decl[InstanceMethod]/Super:         availableP_unavailableC()[#Void#];
+// INTERNAL: End completions
+}
+
+private protocol PrivP {}
+
+private extension PrivP {
+    func availableP_availableC() {}
+
+    func availableP_unavailableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_availableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_unavailableC() {}
+}
+
+struct TestForPrivP: PrivP {
+    func availableP_availableC() {}
+
+    @available(*, unavailable)
+    func availableP_unavailableC() {}
+
+    func unavailableP_availableC() {}
+
+    @available(*, unavailable)
+    func unavailableP_unavailableC() {}
+}
+
+func test(val: TestForPrivP) {
+    val.#^PRIVATE^#
+// PRIVATE: Begin completions, 4 items
+// PRIVATE-DAG: Keyword[self]/CurrNominal:          self[#TestForPrivP#];
+// PRIVATE-DAG: Decl[InstanceMethod]/CurrNominal:   availableP_availableC()[#Void#];
+// PRIVATE-DAG: Decl[InstanceMethod]/CurrNominal:   unavailableP_availableC()[#Void#];
+// PRIVATE-DAG: Decl[InstanceMethod]/Super:         availableP_unavailableC()[#Void#];
+// PRIVATE-DAG: End completions
+}
diff --git a/test/PrintAsObjC/classes.swift b/test/PrintAsObjC/classes.swift
@@ -49,8 +49,26 @@ import SingleGenericClass
 // CHECK-NEXT: @end
 @objc class B1 : A1 {}
 
+// Used in BridgedTypes test case
+struct Notification: _ObjectiveCBridgeable {
+  func _bridgeToObjectiveC() -> NSNotification { fatalError() }
+  static func _forceBridgeFromObjectiveC(
+    _ source: NSNotification,
+    result: inout Self?
+  ) { fatalError() }
+  @discardableResult
+  static func _conditionallyBridgeFromObjectiveC(
+    _ source: NSNotification,
+    result: inout Self?
+  ) -> Bool { fatalError() }
+  @_effects(readonly)
+  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
+    -> Self { fatalError() }
+}
+
 // CHECK-LABEL: @interface BridgedTypes
 // CHECK-NEXT: - (NSDictionary * _Nonnull)dictBridge:(NSDictionary * _Nonnull)x SWIFT_WARN_UNUSED_RESULT;
+// CHECK-NEXT: - (NSNotification * _Nonnull)noteBridge:(NSNotification * _Nonnull)x SWIFT_WARN_UNUSED_RESULT;
 // CHECK-NEXT: - (NSSet * _Nonnull)setBridge:(NSSet * _Nonnull)x SWIFT_WARN_UNUSED_RESULT;
 // CHECK-NEXT: init
 // CHECK-NEXT: @end
@@ -59,6 +77,10 @@ import SingleGenericClass
     return x
   }
 
+  @objc func noteBridge(_ x: Notification) -> Notification {
+    return x
+  }
+
   @objc func setBridge(_ x: Set<NSObject>) -> Set<NSObject> {
     return x
   }
