Merge pull request #17182 from aschwaighofer/irgen_dont_outline_opened_exist_enum

Author: swift-ci

lib/IRGen/GenEnum.cpp

@@ -2326,6 +2326,29 @@ namespace {
         llvm_unreachable("ABI-inaccessible type cannot be loadable");
 
       case Normal: {
+        if (loweredType.hasOpenedExistential()) {
+          EnumPayload payload;
+          llvm::Value *extraTag;
+          std::tie(payload, extraTag) =
+              getPayloadAndExtraTagFromExplosion(IGF, src);
+          llvm::BasicBlock *endBB =
+              testFixedEnumContainsPayload(IGF, payload, extraTag);
+
+          if (PayloadBitCount > 0) {
+            ConditionalDominanceScope condition(IGF);
+            Explosion payloadValue;
+            Explosion payloadCopy;
+            auto &loadableTI = getLoadablePayloadTypeInfo();
+            loadableTI.unpackFromEnumPayload(IGF, payload, payloadValue, 0);
+            loadableTI.copy(IGF, payloadValue, payloadCopy,
+                            IGF.getDefaultAtomicity());
+            (void)payloadCopy.claimAll();
+          }
+          IGF.Builder.CreateBr(endBB);
+          IGF.Builder.emitBlock(endBB);
+          return;
+        }
+
         if (!copyEnumFunction)
           copyEnumFunction = emitCopyEnumFunction(IGF.IGM, loweredType);
         Explosion tmp;
@@ -2363,6 +2386,27 @@ namespace {
         llvm_unreachable("ABI-inaccessible type cannot be loadable");
 
       case Normal: {
+        if (loweredType.hasOpenedExistential()) {
+          EnumPayload payload;
+          llvm::Value *extraTag;
+          std::tie(payload, extraTag) =
+              getPayloadAndExtraTagFromExplosion(IGF, src);
+          llvm::BasicBlock *endBB =
+              testFixedEnumContainsPayload(IGF, payload, extraTag);
+
+          // If we did, consume it.
+          if (PayloadBitCount > 0) {
+            ConditionalDominanceScope condition(IGF);
+            Explosion payloadValue;
+            auto &loadableTI = getLoadablePayloadTypeInfo();
+            loadableTI.unpackFromEnumPayload(IGF, payload, payloadValue, 0);
+            loadableTI.consume(IGF, payloadValue, IGF.getDefaultAtomicity());
+          }
+
+          IGF.Builder.CreateBr(endBB);
+          IGF.Builder.emitBlock(endBB);
+          return;
+        }
         if (!consumeEnumFunction)
           consumeEnumFunction = emitConsumeEnumFunction(IGF.IGM, loweredType);
         Explosion tmp;
@@ -4068,6 +4112,22 @@ namespace {
 
       case BitwiseTakable:
       case Normal: {
+        if (loweredType.hasOpenedExistential()) {
+          auto parts = destructureAndTagLoadableEnum(IGF, src);
+
+          forNontrivialPayloads(
+              IGF, parts.tag,
+              [&](unsigned tagIndex, EnumImplStrategy::Element elt) {
+                auto &lti = cast<LoadableTypeInfo>(*elt.ti);
+                Explosion value;
+                projectPayloadValue(IGF, parts.payload, tagIndex, lti, value);
+
+                Explosion tmp;
+                lti.copy(IGF, value, tmp, IGF.getDefaultAtomicity());
+                (void)tmp.claimAll(); // FIXME: repack if not bit-identical
+              });
+          return;
+        }
         if (!copyEnumFunction)
           copyEnumFunction = emitCopyEnumFunction(IGF.IGM, loweredType);
         Explosion tmp;
@@ -4113,6 +4173,20 @@ namespace {
 
       case BitwiseTakable:
       case Normal: {
+        if (loweredType.hasOpenedExistential()) {
+          auto parts = destructureAndTagLoadableEnum(IGF, src);
+
+          forNontrivialPayloads(
+              IGF, parts.tag,
+              [&](unsigned tagIndex, EnumImplStrategy::Element elt) {
+                auto &lti = cast<LoadableTypeInfo>(*elt.ti);
+                Explosion value;
+                projectPayloadValue(IGF, parts.payload, tagIndex, lti, value);
+
+                lti.consume(IGF, value, IGF.getDefaultAtomicity());
+              });
+          return;
+        }
         if (!consumeEnumFunction)
           consumeEnumFunction = emitConsumeEnumFunction(IGF.IGM, loweredType);
         Explosion tmp;

test/IRGen/outlined_copy_addr.swift

@@ -58,3 +58,20 @@ func testIt<P: BaseProt>(_ f: GenericError<P>?) {
 func dontCrash<P: BaseProt>(_ f: GenericError<P>) {
   testIt(f)
 }
+
+protocol Baz : class {
+}
+extension Baz {
+  static func crash(setup: ((Self) -> ())?){
+  }
+}
+class Foobar {
+  public static func dontCrash() -> Baz? {
+     let cls : Baz.Type = Foobar1.self
+     // This used to crash because we tried to outline the optional consume with
+     // an opened payload existential type.
+     cls.crash(setup: { (arg:  Baz) -> () in  })
+     return nil
+  }
+}
+class Foobar1 : Foobar, Baz { }