AST: Don't call getDirectlyInheritedNominalTypeDecls() on a protocol in ConformanceLookupTable

Author: slavapestov

lib/AST/ConformanceLookupTable.cpp

@@ -527,6 +527,8 @@ void ConformanceLookupTable::addMacroGeneratedProtocols(
 
 void ConformanceLookupTable::expandImpliedConformances(NominalTypeDecl *nominal,
                                                        DeclContext *dc) {
+  ASTContext &ctx = nominal->getASTContext();
+
   // Note: recursive type-checking implies that AllConformances
   // may be reallocated during this traversal, so pay the lookup cost
   // during each iteration.
@@ -546,16 +548,23 @@ void ConformanceLookupTable::expandImpliedConformances(NominalTypeDecl *nominal,
         isa<EnumDecl>(nominal) && nominal->isObjC() &&
         cast<EnumDecl>(nominal)->hasCases() &&
         cast<EnumDecl>(nominal)->hasOnlyCasesWithoutAssociatedValues()) {
-      ASTContext &ctx = nominal->getASTContext();
       if (auto bridgedNSError
             = ctx.getProtocol(KnownProtocolKind::BridgedNSError)) {
         addProtocol(bridgedNSError, SourceLoc(),
                     ConformanceSource::forImplied(conformanceEntry));
       }
     }
 
-    addInheritedProtocols(conformingProtocol,
-                          ConformanceSource::forImplied(conformanceEntry));
+    auto source = ConformanceSource::forImplied(conformanceEntry);
+    for (auto *inherited : conformingProtocol->getInheritedProtocols()) {
+      // Conforming a ~Copyable nominal to a protocol that inherits Copyable
+      // should not imply a Copyable conformance on the nominal.
+      if (ctx.LangOpts.hasFeature(Feature::NoncopyableGenerics))
+        if (inherited->getInvertibleProtocolKind())
+          continue;
+
+      addProtocol(inherited, SourceLoc(), source);
+    }
   }
 }
 

test/Generics/inverse_generics.swift

@@ -446,17 +446,19 @@ public struct Record<Output> {
 protocol P {}
 extension Record : Decodable where Output : P {}
 
-// Expect that if Copyable is an inherited protocol, then conditional
-// conformances carry that through, making the Blahaj conditionally Copyable.
 struct Blahaj<Value>: ~Copyable {
-  deinit {} // expected-error {{deinitializer cannot be declared in generic struct 'Blahaj' that conforms to 'Copyable'}}
+  deinit {} // this is OK
 }
 extension Blahaj: Q where Value: Q {}
+// expected-error@-1 {{type 'Blahaj<Value>' does not conform to protocol 'Copyable'}}
 protocol Q: Copyable {}
+// expected-note@-1 {{type 'Blahaj<Value>' does not conform to inherited protocol 'Copyable'}}
 
 // expected-note@+2 3{{add}}
 // expected-error@+1 {{parameter of noncopyable type 'Blahaj<T>' must specify ownership}}
 func testBlahaj<T, U: Q>(_ x: Blahaj<T>,
+// expected-note@+2 3{{add}}
+// expected-error@+1 {{parameter of noncopyable type 'Blahaj<U>' must specify ownership}}
                          _ y: Blahaj<U>) {}
 
 extension Int: NeedsCopyable {}

test/api-digester/internal-extension.swift

@@ -8,8 +8,6 @@
 // RUN: %api-digester -dump-sdk -module main -o %t.dump.json -module-cache-path %t.module-cache -swift-only -I %t.mod -I %S/Inputs/ClangCake %clang-importer-sdk-nosource
 // RUN: %FileCheck %s < %t.dump.json
 
-// XFAIL: noncopyable_generics
-
 import cake
 
 // CHECK: publicSymbol

test/decl/protocol/conforms/placement.swift

@@ -4,8 +4,6 @@
 
 // RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/placement_2.swift -I %t -verify
 
-// XFAIL: noncopyable_generics
-
 // Tests for the placement of conformances as well as conflicts
 // between conformances that come from different sources.