ConstExtract: Update for noncopyable generics (sort of)

Author: slavapestov

lib/ConstExtract/ConstExtract.cpp

@@ -776,6 +776,10 @@ void writeResultBuilderInformation(llvm::json::OStream &JSON,
 
   for (ProtocolDecl *Decl :
        TypeDecl->getLocalProtocols(ConformanceLookupKind::All)) {
+    // FIXME(noncopyable_generics): Should these be included?
+    if (Decl->getInvertibleProtocolKind())
+      continue;
+
     for (auto Member : Decl->getMembers()) {
       if (auto *VD = dyn_cast<swift::VarDecl>(Member)) {
         if (VD->getName() != VarDecl->getName())
@@ -840,9 +844,16 @@ void writeSubstitutedOpaqueTypeAliasDetails(
       // Ignore requirements whose subject type is that of the owner decl
       if (!Requirement.getFirstType()->isEqual(OpaqueTy.getInterfaceType()))
         continue;
-      if (Requirement.getKind() == RequirementKind::Conformance)
-        JSON.value(
-            toFullyQualifiedProtocolNameString(*Requirement.getProtocolDecl()));
+
+      if (Requirement.getKind() != RequirementKind::Conformance)
+        continue;
+
+      // FIXME(noncopyable_generics): Should these be included?
+      if (Requirement.getProtocolDecl()->getInvertibleProtocolKind())
+        continue;
+
+      JSON.value(
+          toFullyQualifiedProtocolNameString(*Requirement.getProtocolDecl()));
     }
   });
 
@@ -920,7 +931,11 @@ void writeProperties(llvm::json::OStream &JSON,
 void writeConformances(llvm::json::OStream &JSON,
                        const NominalTypeDecl &NomTypeDecl) {
   JSON.attributeArray("conformances", [&] {
-    for (auto &Protocol : NomTypeDecl.getAllProtocols()) {
+    for (auto *Protocol : NomTypeDecl.getAllProtocols()) {
+      // FIXME(noncopyable_generics): Should these be included?
+      if (Protocol->getInvertibleProtocolKind())
+        continue;
+
       JSON.value(toFullyQualifiedProtocolNameString(*Protocol));
     }
   });

test/ConstExtraction/ExtractAnnotations.swift

@@ -172,4 +172,3 @@ public struct DeprecatedAnnotations: MyProto {}
 // CHECK-NEXT:  }
 // CHECK-NEXT:]
 
-// XFAIL: noncopyable_generics

test/ConstExtraction/ExtractCalls.swift

@@ -156,6 +156,3 @@ public struct Bat {
 // CHECK-NEXT:    ]
 // CHECK-NEXT:  }
 // CHECK-NEXT:]
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractConstantsFromMembersAttribute.swift

@@ -65,6 +65,3 @@ enum DirectOnEnum {
 // CHECK:         "kind": "enum",
 // CHECK:         "cases": [
 // CHECK:             "name": "yes"
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractEnums.swift

@@ -227,6 +227,3 @@ public struct Enums: MyProto {
 // CHECK-NEXT:    ]
 // CHECK-NEXT:  }
 // CHECK-NEXT:]
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractFromExtension.swift

@@ -31,6 +31,3 @@ extension MyType {
 // CHECK-NEXT:      }
 // CHECK-NEXT:    }
 // CHECK-NEXT:  ]
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractGroups.swift

@@ -333,6 +333,3 @@ extension String: Foo {}
 // CHECK-NEXT:    ]
 // CHECK-NEXT:  }
 // CHECK-NEXT:]
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractLiterals.swift

@@ -548,6 +548,3 @@ public struct PropertyWrappers : MyProto {
 // CHECK-NEXT:    ]
 // CHECK-NEXT:  }
 // CHECK-NEXT:]
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractOpaqueGenericTypealias.swift

@@ -55,6 +55,3 @@ struct Foo<L : Hashable> : myProto {
 // CHECK-NEXT:     "properties": []
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
-
-// XFAIL: noncopyable_generics
-

test/ConstExtraction/ExtractOpaqueTypealias.swift

@@ -71,6 +71,3 @@ private func baz() -> some protoA<testModBStruct> & protoB<Float> & testModBProt
 // CHECK-NEXT:    "properties": []
 // CHECK-NEXT:  }
 // CHECK-NEXT:]
-
-// XFAIL: noncopyable_generics
-