Merge pull request #14648 from gottesmm/pr-6af503b7a70e6705bcce4becd3ed620695f56c51

Author: swift-ci

lib/SILGen/SILGenBuilder.cpp

@@ -762,6 +762,14 @@ ManagedValue SILGenBuilder::createBridgeObjectToRef(SILLocation loc,
   return cloner.clone(result);
 }
 
+ManagedValue SILGenBuilder::createRefToBridgeObject(SILLocation loc,
+                                                    ManagedValue mv,
+                                                    SILValue bits) {
+  CleanupCloner cloner(*this, mv);
+  SILValue result = createRefToBridgeObject(loc, mv.forward(SGF), bits);
+  return cloner.clone(result);
+}
+
 ManagedValue SILGenBuilder::createBlockToAnyObject(SILLocation loc,
                                                    ManagedValue v,
                                                    SILType destType) {

lib/SILGen/SILGenBuilder.h

@@ -360,6 +360,10 @@ class SILGenBuilder : public SILBuilder {
   ManagedValue createBridgeObjectToRef(SILLocation loc, ManagedValue mv,
                                        SILType destType);
 
+  using SILBuilder::createRefToBridgeObject;
+  ManagedValue createRefToBridgeObject(SILLocation loc, ManagedValue mv,
+                                       SILValue bits);
+
   using SILBuilder::createBranch;
   BranchInst *createBranch(SILLocation Loc, SILBasicBlock *TargetBlock,
                            ArrayRef<ManagedValue> Args);

lib/SILGen/SILGenBuiltin.cpp

@@ -677,11 +677,8 @@ static ManagedValue emitBuiltinCastToBridgeObject(SILGenFunction &SGF,
     SILValue undef = SILUndef::get(objPointerType, SGF.SGM.M);
     return ManagedValue::forUnmanaged(undef);
   }
-  
-  // Save the cleanup on the argument so we can forward it onto the cast
-  // result.
-  auto refCleanup = args[0].getCleanup();
-  SILValue ref = args[0].getValue();
+
+  ManagedValue ref = args[0];
   SILValue bits = args[1].getUnmanagedValue();
 
   // If the argument is existential, open it.
@@ -691,9 +688,8 @@ static ManagedValue emitBuiltinCastToBridgeObject(SILGenFunction &SGF,
     SILType loweredOpenedTy = SGF.getLoweredLoadableType(openedTy);
     ref = SGF.B.createOpenExistentialRef(loc, ref, loweredOpenedTy);
   }
-  
-  SILValue result = SGF.B.createRefToBridgeObject(loc, ref, bits);
-  return ManagedValue(result, refCleanup);
+
+  return SGF.B.createRefToBridgeObject(loc, ref, bits);
 }
 
 /// Specialized emitter for Builtin.castReferenceFromBridgeObject.