IRGen: Fix some more incorrect conformance checks

Author: slavapestov

lib/IRGen/GenArchetype.cpp

@@ -414,7 +414,7 @@ const TypeInfo *TypeConverter::convertArchetypeType(ArchetypeType *archetype) {
       IGM.getSwiftModule()->getASTContext().getProtocol(
           KnownProtocolKind::BitwiseCopyable);
   // The protocol won't be present in swiftinterfaces from older SDKs.
-  if (bitwiseCopyableProtocol && IGM.getSwiftModule()->lookupConformance(
+  if (bitwiseCopyableProtocol && IGM.getSwiftModule()->checkConformance(
                                      archetype, bitwiseCopyableProtocol)) {
     return BitwiseCopyableTypeInfo::create(storageType, abiAccessible);
   }

lib/IRGen/GenEnum.cpp

@@ -7296,17 +7296,19 @@ ResilientEnumImplStrategy::completeEnumTypeLayout(TypeConverter &TC,
                                                   SILType Type,
                                                   EnumDecl *theEnum,
                                                   llvm::StructType *enumTy) {
+  auto cp = !theEnum->canBeCopyable()
+    ? IsNotCopyable : IsCopyable;
   auto abiAccessible = IsABIAccessible_t(TC.IGM.isTypeABIAccessible(Type));
   auto *bitwiseCopyableProtocol =
       IGM.getSwiftModule()->getASTContext().getProtocol(
           KnownProtocolKind::BitwiseCopyable);
   if (bitwiseCopyableProtocol &&
-      IGM.getSwiftModule()->lookupConformance(
-          theEnum->getDeclaredInterfaceType(), bitwiseCopyableProtocol)) {
+      IGM.getSwiftModule()->checkConformance(Type.getASTType(),
+                                             bitwiseCopyableProtocol)) {
     return BitwiseCopyableTypeInfo::create(enumTy, abiAccessible);
   }
   return registerEnumTypeInfo(
-                       new ResilientEnumTypeInfo(*this, enumTy, Copyable,
+                       new ResilientEnumTypeInfo(*this, enumTy, cp,
                                                  abiAccessible));
 }
 

lib/IRGen/GenStruct.cpp

@@ -1705,8 +1705,7 @@ const TypeInfo *TypeConverter::convertStructType(TypeBase *key, CanType type,
         IGM.getSwiftModule()->getASTContext().getProtocol(
             KnownProtocolKind::BitwiseCopyable);
     if (bitwiseCopyableProtocol &&
-        IGM.getSwiftModule()->lookupConformance(D->getDeclaredInterfaceType(),
-                                                bitwiseCopyableProtocol)) {
+        IGM.getSwiftModule()->checkConformance(type, bitwiseCopyableProtocol)) {
       return BitwiseCopyableTypeInfo::create(IGM.OpaqueTy, structAccessible);
     }
     return &getResilientStructTypeInfo(copyable, structAccessible);

test/Interpreter/Inputs/bitwise_copyable_other.swift

@@ -0,0 +1,13 @@
+public struct BitwiseStruct<T> {
+  var t: T
+
+  public init(t: T) { self.t = t }
+}
+
+extension BitwiseStruct: _BitwiseCopyable where T: _BitwiseCopyable {}
+
+public enum BitwiseEnum<T> {
+  case t(T)
+}
+
+extension BitwiseEnum: _BitwiseCopyable where T: _BitwiseCopyable {}

test/Interpreter/bitwise_copyable.swift

@@ -0,0 +1,34 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-build-swift-dylib(%t/%target-library-name(bitwise_copyable_other)) -enable-library-evolution %S/Inputs/bitwise_copyable_other.swift -emit-module -emit-module-path %t/bitwise_copyable_other.swiftmodule -module-name bitwise_copyable_other
+// RUN: %target-codesign %t/%target-library-name(bitwise_copyable_other)
+
+// RUN: %target-build-swift %s -lbitwise_copyable_other -I %t -L %t -o %t/main %target-rpath(%t)
+// RUN: %target-codesign %t/main
+
+// RUN: %target-run %t/main %t/%target-library-name(bitwise_copyable_other)
+
+// REQUIRES: executable_test
+
+import StdlibUnittest
+import bitwise_copyable_other
+
+var bitwise = TestSuite("BitwiseCopyable")
+
+bitwise.test("Conditional conformance with resilient struct") {
+  func callee(_: consuming BitwiseStruct<LifetimeTracked>) {}
+
+  for _ in 0..<10 {
+    callee(BitwiseStruct(t: LifetimeTracked(0)))
+  }
+}
+
+bitwise.test("Conditional conformance with resilient enum") {
+  func callee(_: consuming BitwiseEnum<LifetimeTracked>) {}
+
+  for _ in 0..<10 {
+    callee(BitwiseEnum.t(LifetimeTracked(0)))
+  }
+}
+
+runAllTests()