[cxx-interop] Don't synthesize conformance to invalid protocols.

Author: zoecarver

lib/AST/ProtocolConformance.cpp

@@ -1053,6 +1053,9 @@ void NominalTypeDecl::prepareConformanceTable() const {
   SmallPtrSet<ProtocolDecl *, 2> protocols;
 
   auto addSynthesized = [&](ProtocolDecl *proto) {
+    if (!proto)
+      return;
+
     if (protocols.count(proto) == 0) {
       ConformanceTable->addSynthesizedConformance(
           mutableThis, proto, mutableThis);

lib/ClangImporter/ImportDecl.cpp

@@ -429,8 +429,13 @@ void ClangImporter::Implementation::addSynthesizedProtocolAttrs(
   auto &ctx = nominal->getASTContext();
 
   for (auto kind : synthesizedProtocolAttrs) {
-    nominal->getAttrs().add(
-        new (ctx) SynthesizedProtocolAttr(ctx.getProtocol(kind), this, isUnchecked));
+    // This is unfortunately not an error because some test use mock protocols.
+    // If those tests were updated, we could assert that
+    // ctx.getProtocol(kind) != nulltpr which would be nice.
+    if (auto proto = ctx.getProtocol(kind))
+      nominal->getAttrs().add(
+          new (ctx) SynthesizedProtocolAttr(ctx.getProtocol(kind), this,
+                                            isUnchecked));
   }
 }