Merge pull request #12991 from DougGregor/conditional-conformance-fixes

Author: swift-ci

lib/AST/Type.cpp

@@ -3015,8 +3015,6 @@ static Type getMemberForBaseType(LookupConformanceFn lookupConformances,
 
     if (!conformance) return failed();
     if (!conformance->isConcrete()) return failed();
-    assert(conformance->getConditionalRequirements().empty() &&
-           "unhandled conditional requirements");
 
     // Retrieve the type witness.
     auto witness =

lib/ParseSIL/ParseSIL.cpp

@@ -5661,8 +5661,25 @@ bool SILParserTUState::parseSILWitnessTable(Parser &P) {
           EntryKeyword.str() == "conditional_conformance") {
         if (P.parseToken(tok::l_paren, diag::expected_sil_witness_lparen))
           return true;
-        CanType assoc = parseAssociatedTypePath(P, WitnessState, proto);
-        if (!assoc)
+        CanType assocOrSubject;
+        if (EntryKeyword.str() == "associated_type_protocol") {
+          assocOrSubject = parseAssociatedTypePath(P, WitnessState, proto);
+        } else {
+          // Parse AST type.
+          ParserResult<TypeRepr> TyR = P.parseType();
+          if (TyR.isNull())
+            return true;
+          TypeLoc Ty = TyR.get();
+          if (swift::performTypeLocChecking(P.Context, Ty,
+                                            /*isSILMode=*/false,
+                                            /*isSILType=*/false,
+                                            witnessEnv,
+                                            &P.SF))
+            return true;
+
+          assocOrSubject = Ty.getType()->getCanonicalType();
+        }
+        if (!assocOrSubject)
           return true;
         if (P.parseToken(tok::colon, diag::expected_sil_witness_colon))
           return true;
@@ -5685,11 +5702,13 @@ bool SILParserTUState::parseSILWitnessTable(Parser &P) {
 
         if (EntryKeyword.str() == "associated_type_protocol")
           witnessEntries.push_back(
-              SILWitnessTable::AssociatedTypeProtocolWitness{assoc, proto,
+              SILWitnessTable::AssociatedTypeProtocolWitness{assocOrSubject,
+                                                             proto,
                                                              conformance});
         else
           conditionalConformances.push_back(
-              SILWitnessTable::ConditionalConformance{assoc, conformance});
+              SILWitnessTable::ConditionalConformance{assocOrSubject,
+                                                      conformance});
 
         continue;
       }

lib/Sema/CSApply.cpp

@@ -474,9 +474,6 @@ namespace {
               tc.conformsToProtocol(baseTy, proto, cs.DC,
                                     (ConformanceCheckFlags::InExpression|
                                          ConformanceCheckFlags::Used));
-            assert((!conformance ||
-                    conformance->getConditionalRequirements().empty()) &&
-                   "unhandled conditional conformance");
             if (conformance && conformance->isConcrete()) {
               if (auto witness =
                         conformance->getConcrete()->getWitnessDecl(decl, &tc)) {

lib/Sema/CSDiag.cpp

@@ -4844,7 +4844,7 @@ bool FailureDiagnosis::diagnoseArgumentGenericRequirements(
     AFD = dyn_cast<AbstractFunctionDecl>(candidate);
   }
 
-  if (!AFD || !AFD->isGeneric() || !AFD->hasInterfaceType())
+  if (!AFD || !AFD->getGenericSignature() || !AFD->hasInterfaceType())
     return false;
 
   auto env = AFD->getGenericEnvironment();

lib/Sema/MiscDiagnostics.cpp

@@ -1418,7 +1418,15 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,
     ///       x == nil    // also !=
     ///
     void checkOptionalPromotions(ApplyExpr *call) {
-      auto DRE = dyn_cast<DeclRefExpr>(call->getSemanticFn());
+      // We only care about binary expressions.
+      if (!isa<BinaryExpr>(call)) return;
+
+      // Dig out the function we're calling.
+      auto fnExpr = call->getSemanticFn();
+      if (auto dotSyntax = dyn_cast<DotSyntaxCallExpr>(fnExpr))
+        fnExpr = dotSyntax->getSemanticFn();
+
+      auto DRE = dyn_cast<DeclRefExpr>(fnExpr);
       auto args = dyn_cast<TupleExpr>(call->getArg());
       if (!DRE || !DRE->getDecl()->isOperator() ||
           !args || args->getNumElements() != 2)

test/SIL/Parser/witness_tables.sil

@@ -96,3 +96,22 @@ sil_witness_table DeadMethodClass: Proto module witness_tables {
   method #Proto.abc!1: nil
 }
 
+protocol P {
+}
+
+struct ConditionalStruct<T> {
+  init()
+}
+
+extension ConditionalStruct : P where T : P {
+}
+
+// CHECK-LABEL: sil_witness_table hidden <T where T : P> ConditionalStruct<T>: P module witness_tables {
+// CHECK-NEXT:    conditional_conformance (T: P): dependent
+// CHECL-NEXT:   }
+sil_witness_table hidden <T where T : P> ConditionalStruct<T>: P module t4 {
+  conditional_conformance (T: P): dependent
+}
+
+sil_default_witness_table hidden P {
+}