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

lib/AST/ConformanceLookupTable.cpp

@@ -432,7 +432,7 @@ namespace {
       return;
     }
   }
-}
+} // end anonymous namespace
 
 bool ConformanceLookupTable::addProtocol(NominalTypeDecl *nominal,
                                          ProtocolDecl *protocol, SourceLoc loc,
@@ -801,8 +801,7 @@ ProtocolConformance *ConformanceLookupTable::getConformance(
     return nullptr;
 
   auto *conformingNominal =
-    cast<NominalTypeDecl>(conformingDC->
-                          getAsGenericTypeOrGenericTypeExtensionContext());
+    conformingDC->getAsNominalTypeOrNominalTypeExtensionContext();
 
   // Form the conformance.
   Type type = entry->getDeclContext()->getDeclaredTypeInContext();