Merge pull request #5558 from DougGregor/witness-subst-cleanup

Author: swift-ci

include/swift/AST/DiagnosticsSema.def

@@ -1906,6 +1906,8 @@ ERROR(property_behavior_invalid_parameter,none,
       "parameter expression provided, but property behavior %0 does not "
       "use it",
       (Identifier))
+ERROR(property_behavior_conformance_broken,none,
+      "property behavior for %0 in type %1 is broken", (DeclName, Type))
 
 //------------------------------------------------------------------------------
 // Type Check Attributes

lib/AST/ArchetypeBuilder.cpp

@@ -1301,7 +1301,6 @@ bool ArchetypeBuilder::addSameTypeRequirement(Type Reqt1, Type Reqt2,
 
   // Require that at least one side of the requirement be a potential archetype.
   if (!T1 && !T2) {
-    assert(Source.getLoc().isValid() && "reintroducing invalid requirement");
     Diags.diagnose(Source.getLoc(), diag::requires_no_same_type_archetype);
     return true;
   }
@@ -1489,7 +1488,7 @@ void ArchetypeBuilder::addRequirement(const Requirement &req,
   switch (req.getKind()) {
   case RequirementKind::Superclass: {
     PotentialArchetype *pa = resolveArchetype(req.getFirstType());
-    assert(pa && "Re-introducing invalid requirement");
+    if (!pa) return;
 
     assert(req.getSecondType()->getClassOrBoundGenericClass());
     addSuperclassRequirement(pa, req.getSecondType(), source);
@@ -1498,11 +1497,7 @@ void ArchetypeBuilder::addRequirement(const Requirement &req,
 
   case RequirementKind::Conformance: {
     PotentialArchetype *pa = resolveArchetype(req.getFirstType());
-    assert(pa && "Re-introducing invalid requirement");
-    // FIXME: defensively return if assertions are disabled until we figure out
-    // how this situation can occur and fix it properly.
-    if (!pa)
-      return;
+    if (!pa) return;
 
     SmallVector<ProtocolDecl *, 4> conformsTo;
     bool existential = req.getSecondType()->isExistentialType(conformsTo);

lib/Sema/CSApply.cpp

@@ -2153,6 +2153,8 @@ namespace {
       auto type = simplifyType(openedType);
       expr->setType(type);
 
+      if (type->is<UnresolvedType>()) return expr;
+
       Type conformingType = type;
       if (auto baseType = conformingType->getAnyOptionalObjectType()) {
         // The type may be optional due to a failable initializer in the

lib/Sema/CodeSynthesis.cpp

@@ -1270,15 +1270,17 @@ void TypeChecker::completePropertyBehaviorStorage(VarDecl *VD,
   // Add accessors to the storage, since we'll need them to satisfy the
   // conformance requirements.
   addTrivialAccessorsToStorage(Storage, *this);
-  
+
+  // FIXME: Hack to eliminate spurious diagnostics.
+  if (BehaviorStorage->isStatic() != Storage->isStatic()) return;
+
   // Add the witnesses to the conformance.
-  // FIXME: Dropping substitution.
-  BehaviorConformance->setWitness(BehaviorStorage, Storage);
-  BehaviorConformance->setWitness(BehaviorStorage->getGetter(),
-                                  Storage->getGetter());
+  recordKnownWitness(BehaviorConformance, BehaviorStorage, Storage);
+  recordKnownWitness(BehaviorConformance, BehaviorStorage->getGetter(),
+                     Storage->getGetter());
   if (BehaviorStorage->isSettable(DC))
-    BehaviorConformance->setWitness(BehaviorStorage->getSetter(),
-                                    Storage->getSetter());
+    recordKnownWitness(BehaviorConformance, BehaviorStorage->getSetter(),
+                       Storage->getSetter());
 }
 
 void TypeChecker::completePropertyBehaviorParameter(VarDecl *VD,
@@ -1433,8 +1435,7 @@ void TypeChecker::completePropertyBehaviorParameter(VarDecl *VD,
   addMemberToContextIfNeeded(Parameter, DC);
 
   // Add the witnesses to the conformance.
-  // FIXME: Should compute substitutions.
-  BehaviorConformance->setWitness(BehaviorParameter, Parameter);
+  recordKnownWitness(BehaviorConformance, BehaviorParameter, Parameter);
 }
 
 void TypeChecker::completePropertyBehaviorAccessors(VarDecl *VD,

lib/Sema/TypeCheckDecl.cpp

@@ -2160,7 +2160,8 @@ static Optional<ObjCReason> shouldMarkAsObjC(TypeChecker &TC,
   else if (VD->getOverriddenDecl() && VD->getOverriddenDecl()->isObjC())
     return ObjCReason::OverridesObjC;
   // A witness to an @objc protocol requirement is implicitly @objc.
-  else if (!TC.findWitnessedObjCRequirements(
+  else if (VD->getDeclContext()->getAsClassOrClassExtensionContext() &&
+           !TC.findWitnessedObjCRequirements(
              VD,
              /*anySingleRequirement=*/true).empty())
     return ObjCReason::WitnessToObjC;