---

yaml
---
r: 342006
b: refs/heads/rxwei-patch-1
c: bd9b18e
h: refs/heads/master

Author: DougGregor

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: ab995ecbaae5c4fcb787f6ff60de3494506387fe
+refs/heads/rxwei-patch-1: bd9b18ef65301ddaa28cf09267c096d6815a07ce
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -4120,20 +4120,7 @@ class ProtocolDecl final : public NominalTypeDecl {
     Bits.ProtocolDecl.RequiresClass = requiresClass;
   }
 
-  /// Returns the cached result of \c existentialConformsToSelf or \c None if it
-  /// hasn't yet been computed.
-  Optional<bool> getCachedExistentialConformsToSelf() const {
-    if (Bits.ProtocolDecl.ExistentialConformsToSelfValid)
-      return Bits.ProtocolDecl.ExistentialConformsToSelf;
-
-    return None;
-  }
-
-  /// Caches the result of \c existentialConformsToSelf
-  void setCachedExistentialConformsToSelf(bool result) {
-    Bits.ProtocolDecl.ExistentialConformsToSelfValid = true;
-    Bits.ProtocolDecl.ExistentialConformsToSelf = result;
-  }
+  bool existentialConformsToSelfSlow();
 
   bool existentialTypeSupportedSlow();
 
@@ -4147,7 +4134,6 @@ class ProtocolDecl final : public NominalTypeDecl {
   friend class SuperclassTypeRequest;
   friend class RequirementSignatureRequest;
   friend class ProtocolRequiresClassRequest;
-  friend class ExistentialConformsToSelfRequest;
   friend class TypeChecker;
 
 public:
@@ -4218,7 +4204,13 @@ class ProtocolDecl final : public NominalTypeDecl {
   /// This is only permitted if there is nothing "non-trivial" that we
   /// can do with the metatype, which means the protocol must not have
   /// any static methods and must be declared @objc.
-  bool existentialConformsToSelf() const;
+  bool existentialConformsToSelf() const {
+    if (Bits.ProtocolDecl.ExistentialConformsToSelfValid)
+      return Bits.ProtocolDecl.ExistentialConformsToSelf;
+
+    return const_cast<ProtocolDecl *>(this)
+             ->existentialConformsToSelfSlow();
+  }
 
   /// Does this protocol require a self-conformance witness table?
   bool requiresSelfConformanceWitnessTable() const;

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -4523,9 +4523,6 @@ WARNING(property_wrapper_init_initialValue,none,
         ())
 ERROR(property_wrapper_projection_value_missing,none,
       "could not find projection value property %0", (Identifier))
-ERROR(property_wrapper_missing_arg_init, none, "missing argument for parameter "
-      "%0 in property wrapper initializer; add 'wrappedValue' and %0 "
-      "arguments in '@%1(...)'", (Identifier, StringRef))
 
 //------------------------------------------------------------------------------
 // MARK: function builder diagnostics

branches/rxwei-patch-1/include/swift/AST/TypeCheckRequests.h

@@ -201,32 +201,6 @@ class ProtocolRequiresClassRequest:
   void cacheResult(bool value) const;
 };
 
-/// Determine whether an existential conforming to a protocol can be matched
-/// with a generic type parameter constrained to that protocol.
-class ExistentialConformsToSelfRequest:
-    public SimpleRequest<ExistentialConformsToSelfRequest,
-                         bool(ProtocolDecl *),
-                         CacheKind::SeparatelyCached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  llvm::Expected<bool> evaluate(Evaluator &evaluator, ProtocolDecl *decl) const;
-
-public:
-  // Cycle handling.
-  void diagnoseCycle(DiagnosticEngine &diags) const;
-  void noteCycleStep(DiagnosticEngine &diags) const;
-
-  // Separate caching.
-  bool isCached() const { return true; }
-  Optional<bool> getCachedResult() const;
-  void cacheResult(bool value) const;
-};
-
 /// Determine whether the given declaration is 'final'.
 class IsFinalRequest :
     public SimpleRequest<IsFinalRequest,

branches/rxwei-patch-1/include/swift/AST/TypeCheckerTypeIDZone.def

@@ -20,7 +20,6 @@ SWIFT_TYPEID(EnumRawTypeRequest)
 SWIFT_TYPEID(OverriddenDeclsRequest)
 SWIFT_TYPEID(IsObjCRequest)
 SWIFT_TYPEID(ProtocolRequiresClassRequest)
-SWIFT_TYPEID(ExistentialConformsToSelfRequest)
 SWIFT_TYPEID(IsFinalRequest)
 SWIFT_TYPEID(IsDynamicRequest)
 SWIFT_TYPEID(RequirementRequest)

branches/rxwei-patch-1/lib/AST/Decl.cpp

@@ -4329,9 +4329,43 @@ bool ProtocolDecl::requiresSelfConformanceWitnessTable() const {
   return isSpecificProtocol(KnownProtocolKind::Error);
 }
 
-bool ProtocolDecl::existentialConformsToSelf() const {
-  return evaluateOrDefault(getASTContext().evaluator,
-    ExistentialConformsToSelfRequest{const_cast<ProtocolDecl *>(this)}, true);
+bool ProtocolDecl::existentialConformsToSelfSlow() {
+  // Assume for now that the existential conforms to itself; this
+  // prevents circularity issues.
+  Bits.ProtocolDecl.ExistentialConformsToSelfValid = true;
+  Bits.ProtocolDecl.ExistentialConformsToSelf = true;
+
+  // If it's not @objc, it conforms to itself only if it has a
+  // self-conformance witness table.
+  if (!isObjC()) {
+    bool hasSelfConformance = requiresSelfConformanceWitnessTable();
+    Bits.ProtocolDecl.ExistentialConformsToSelf = hasSelfConformance;
+    return hasSelfConformance;
+  }
+
+  // Check whether this protocol conforms to itself.
+  for (auto member : getMembers()) {
+    if (member->isInvalid())
+      continue;
+
+    if (auto vd = dyn_cast<ValueDecl>(member)) {
+      if (!vd->isInstanceMember()) {
+        // A protocol cannot conform to itself if it has static members.
+        Bits.ProtocolDecl.ExistentialConformsToSelf = false;
+        return false;
+      }
+    }
+  }
+
+  // Check whether any of the inherited protocols fail to conform to
+  // themselves.
+  for (auto proto : getInheritedProtocols()) {
+    if (!proto->existentialConformsToSelf()) {
+      Bits.ProtocolDecl.ExistentialConformsToSelf = false;
+      return false;
+    }
+  }
+  return true;
 }
 
 /// Classify usages of Self in the given type.

branches/rxwei-patch-1/lib/AST/TypeCheckRequests.cpp

@@ -211,31 +211,6 @@ void ProtocolRequiresClassRequest::cacheResult(bool value) const {
   decl->setCachedRequiresClass(value);
 }
 
-//----------------------------------------------------------------------------//
-// existentialConformsToSelf computation.
-//----------------------------------------------------------------------------//
-
-void ExistentialConformsToSelfRequest::diagnoseCycle(DiagnosticEngine &diags) const {
-  auto decl = std::get<0>(getStorage());
-  diags.diagnose(decl, diag::circular_protocol_def, decl->getName());
-}
-
-void ExistentialConformsToSelfRequest::noteCycleStep(DiagnosticEngine &diags) const {
-  auto requirement = std::get<0>(getStorage());
-  diags.diagnose(requirement, diag::kind_declname_declared_here,
-                 DescriptiveDeclKind::Protocol, requirement->getName());
-}
-
-Optional<bool> ExistentialConformsToSelfRequest::getCachedResult() const {
-  auto decl = std::get<0>(getStorage());
-  return decl->getCachedExistentialConformsToSelf();
-}
-
-void ExistentialConformsToSelfRequest::cacheResult(bool value) const {
-  auto decl = std::get<0>(getStorage());
-  decl->setCachedExistentialConformsToSelf(value);
-}
-
 //----------------------------------------------------------------------------//
 // isFinal computation.
 //----------------------------------------------------------------------------//

branches/rxwei-patch-1/lib/IDE/ExprContextAnalysis.cpp

@@ -583,15 +583,6 @@ class ExprContextAnalyzer {
     case ExprKind::Array: {
       if (auto type = ParsedExpr->getType()) {
         recordPossibleType(type);
-        break;
-      }
-
-      // Check context types of the array literal expression.
-      ExprContextInfo arrayCtxtInfo(DC, Parent);
-      for (auto arrayT : arrayCtxtInfo.getPossibleTypes()) {
-        if (auto boundGenericT = arrayT->getAs<BoundGenericType>())
-          if (boundGenericT->getDecl() == Context.getArrayDecl())
-            recordPossibleType(boundGenericT->getGenericArgs()[0]);
       }
       break;
     }

branches/rxwei-patch-1/lib/Sema/CSDiag.cpp

@@ -3219,20 +3219,13 @@ class ArgumentMatcher : public MatchCallArgumentListener {
 
     assert(insertLoc.isValid() && "missing argument after trailing closure?");
 
-    if (name.empty()) {
+    if (name.empty())
       TC.diagnose(insertLoc, diag::missing_argument_positional,
                   missingParamIdx + 1)
           .fixItInsert(insertLoc, insertText.str());
-    } else {
-      if (isPropertyWrapperImplicitInit()) {
-        auto TE = cast<TypeExpr>(FnExpr);
-        TC.diagnose(TE->getLoc(), diag::property_wrapper_missing_arg_init, name,
-                    TE->getInstanceType()->getString());
-      } else {
-        TC.diagnose(insertLoc, diag::missing_argument_named, name)
-            .fixItInsert(insertLoc, insertText.str());
-      }
-    }
+    else
+      TC.diagnose(insertLoc, diag::missing_argument_named, name)
+          .fixItInsert(insertLoc, insertText.str());
 
     auto candidate = CandidateInfo[0];
     if (candidate.getDecl())
@@ -3242,27 +3235,6 @@ class ArgumentMatcher : public MatchCallArgumentListener {
     Diagnosed = true;
   }
 
-  bool isPropertyWrapperImplicitInit() {
-    auto TE = dyn_cast<TypeExpr>(FnExpr);
-    if (!TE)
-      return false;
-
-    auto instanceTy = TE->getInstanceType();
-    if (!instanceTy)
-      return false;
-
-    auto nominalDecl = instanceTy->getAnyNominal();
-    if (!(nominalDecl &&
-          nominalDecl->getAttrs().hasAttribute<PropertyWrapperAttr>()))
-      return false;
-
-    if (auto *parentExpr = CandidateInfo.CS.getParentExpr(FnExpr)) {
-      return parentExpr->isImplicit() && isa<CallExpr>(parentExpr);
-    }
-
-    return false;
-  }
-
   bool missingLabel(unsigned paramIdx) override {
     return false;
   }

branches/rxwei-patch-1/lib/Sema/TypeCheckDecl.cpp

@@ -1269,34 +1269,6 @@ ProtocolRequiresClassRequest::evaluate(Evaluator &evaluator,
   return false;
 }
 
-llvm::Expected<bool>
-ExistentialConformsToSelfRequest::evaluate(Evaluator &evaluator,
-                                           ProtocolDecl *decl) const {
-  // If it's not @objc, it conforms to itself only if it has a self-conformance
-  // witness table.
-  if (!decl->isObjC())
-    return decl->requiresSelfConformanceWitnessTable();
-
-  // Check whether this protocol conforms to itself.
-  for (auto member : decl->getMembers()) {
-    if (member->isInvalid()) continue;
-
-    if (auto vd = dyn_cast<ValueDecl>(member)) {
-      // A protocol cannot conform to itself if it has static members.
-      if (!vd->isInstanceMember())
-        return false;
-    }
-  }
-
-  // Check whether any of the inherited protocols fail to conform to themselves.
-  for (auto proto : decl->getInheritedProtocols()) {
-    if (!proto->existentialConformsToSelf())
-      return false;
-  }
-
-  return true;
-}
-
 llvm::Expected<bool>
 IsFinalRequest::evaluate(Evaluator &evaluator, ValueDecl *decl) const {
   if (isa<ClassDecl>(decl))

branches/rxwei-patch-1/test/IDE/complete_call_arg.swift

@@ -82,14 +82,6 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_AFTERPAREN_2 | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_AFTERPAREN_2
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_SECOND | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_SECOND
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_SKIPPED | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_SKIPPED
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_1_AFTERPAREN_1 | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_AFTERPAREN_1
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_1_AFTERPAREN_2 | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_AFTERPAREN_2
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_1_SECOND | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_SECOND
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_1_SKIPPED | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_SKIPPED
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_2_AFTERPAREN_1 | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_AFTERPAREN_1
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_2_AFTERPAREN_2 | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_AFTERPAREN_2
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_2_SECOND | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_SECOND
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_MEMBER_ARRAY_2_SKIPPED | %FileCheck %s -check-prefix=IMPLICIT_MEMBER_SKIPPED
 
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=ARCHETYPE_GENERIC_1 | %FileCheck %s -check-prefix=ARCHETYPE_GENERIC_1
 
@@ -696,39 +688,6 @@ func testImplicitMember() {
 // IMPLICIT_MEMBER_SKIPPED: Keyword/ExprSpecific:               arg4: [#Argument name#];
 // IMPLICIT_MEMBER_SKIPPED: End completions
 }
-func testImplicitMemberInArrayLiteral() {
-  struct Receiver {
-    init(_: [TestStaticMemberCall]) {}
-    init(arg1: Int, arg2: [TestStaticMemberCall]) {}
-  }
-
-  Receiver([
-    .create1(x: 1),
-    .create1(#^IMPLICIT_MEMBER_ARRAY_1_AFTERPAREN_1^#),
-    // Same as IMPLICIT_MEMBER_AFTERPAREN_1.
-  ])
-  Receiver([
-    .create2(#^IMPLICIT_MEMBER_ARRAY_1_AFTERPAREN_2^#),
-    // Same as IMPLICIT_MEMBER_AFTERPAREN_2.
-    .create2(1, #^IMPLICIT_MEMBER_ARRAY_1_SECOND^#
-    // Same as IMPLICIT_MEMBER_SECOND.
-  ])
-  Receiver(arg1: 12, arg2: [
-    .create2(1, arg3: 2, #^IMPLICIT_MEMBER_ARRAY_1_SKIPPED^#
-    // Same as IMPLICIT_MEMBER_SKIPPED.
-    .create1(x: 12)
-  ])
-  let _: [TestStaticMemberCall] = [
-    .create1(#^IMPLICIT_MEMBER_ARRAY_2_AFTERPAREN_1^#),
-    // Same as STATIC_METHOD_AFTERPAREN_1.
-    .create2(#^IMPLICIT_MEMBER_ARRAY_2_AFTERPAREN_2^#),
-    // Same as STATIC_METHOD_AFTERPAREN_2.
-    .create2(1, #^IMPLICIT_MEMBER_ARRAY_2_SECOND^#),
-    // Same as STATIC_METHOD_SECOND.
-    .create2(1, arg3: 2, #^IMPLICIT_MEMBER_ARRAY_2_SKIPPED^#),
-    // Same as STATIC_METHOD_SKIPPED.
-  ]
-}
 
 struct Wrap<T> {
   func method<U>(_ fn: (T) -> U) -> Wrap<U> {}

branches/rxwei-patch-1/test/decl/protocol/conforms/redundant_conformance.swift

@@ -65,3 +65,24 @@ extension OtherGenericConditionalConformsToP: P1 {
     typealias A = Double
     func f() -> Double { return 0.0 }
 }
+
+// FB6114209: spurious ambiguity errors
+protocol MyUsefulProtocol {
+  var someInt: Int { get }
+}
+
+class Class1 {
+  typealias ProviderOne = MyUsefulProtocol
+}
+
+class Class2 {
+  typealias ProviderTwo = MyUsefulProtocol
+}
+
+class Class3 {
+  typealias ProviderThree = Class1.ProviderOne & Class2.ProviderTwo
+}
+
+class SomeMockClass: Class3.ProviderThree { // okay
+  var someInt: Int = 5
+}

branches/rxwei-patch-1/test/decl/var/property_wrappers.swift

@@ -1091,19 +1091,3 @@ struct InvalidPropertyDelegateUse {
     self.x.foo() // expected-error {{value of type 'Int' has no member 'foo'}}
   }
 }
-
-// SR-11060
-
-class SR_11060_Class {
-  @SR_11060_Wrapper var property: Int = 1234 // expected-error {{missing argument for parameter 'string' in property wrapper initializer; add 'wrappedValue' and 'string' arguments in '@SR_11060_Wrapper(...)'}}
-}
-
-@propertyWrapper
-struct SR_11060_Wrapper {
-  var wrappedValue: Int
-  
-  init(wrappedValue: Int, string: String) { // expected-note {{'init(wrappedValue:string:)' declared here}}
-    self.wrappedValue = wrappedValue
-  }
-}
-

branches/rxwei-patch-1/unittests/Basic/CacheTest.cpp

@@ -153,9 +153,9 @@ TEST(Cache, sameKeyValue) {
 }
 
 TEST(Cache, sameKeyValueDestroysKey) {
+  swift::sys::Cache<KeyCounter, Counter> cache(__func__);
   KeyCounter k1, k2;
   Counter c;
-  swift::sys::Cache<KeyCounter, Counter> cache(__func__);
   cache.set(k1, c);
   cache.set(k2, c);
   EXPECT_EQ(1, k1.enter);