Merge pull request #29599 from gottesmm/pr-762e321418ba69083a3400aa47cb65b0d34f5e37

Author: swift-ci

include/swift/SIL/SILBuilder.h

@@ -806,12 +806,6 @@ class SILBuilder {
                       EndBorrowInst(getSILDebugLocation(loc), borrowedValue));
   }
 
-  EndBorrowInst *createEndBorrow(SILLocation Loc, SILValue BorrowedValue,
-                                 SILValue OriginalValue) {
-    return insert(new (getModule())
-                      EndBorrowInst(getSILDebugLocation(Loc), BorrowedValue));
-  }
-
   BeginAccessInst *createBeginAccess(SILLocation loc, SILValue address,
                                      SILAccessKind accessKind,
                                      SILAccessEnforcement enforcement,

include/swift/SIL/SILCloner.h

@@ -1177,9 +1177,8 @@ void SILCloner<ImplClass>::visitEndBorrowInst(EndBorrowInst *Inst) {
     return;
 
   recordClonedInstruction(
-      Inst,
-      getBuilder().createEndBorrow(getOpLocation(Inst->getLoc()),
-                                   getOpValue(Inst->getOperand()), SILValue()));
+      Inst, getBuilder().createEndBorrow(getOpLocation(Inst->getLoc()),
+                                         getOpValue(Inst->getOperand())));
 }
 
 template <typename ImplClass>

lib/SILGen/FormalEvaluation.cpp

@@ -48,8 +48,7 @@ void FormalAccess::verify(SILGenFunction &SGF) const {
 //===----------------------------------------------------------------------===//
 
 void SharedBorrowFormalAccess::finishImpl(SILGenFunction &SGF) {
-  SGF.B.createEndBorrow(CleanupLocation::get(loc), borrowedValue,
-                        originalValue);
+  SGF.B.createEndBorrow(CleanupLocation::get(loc), borrowedValue);
 }
 
 //===----------------------------------------------------------------------===//

lib/SILGen/SILGenLValue.cpp

@@ -3711,7 +3711,7 @@ static SILValue emitLoadOfSemanticRValue(SILGenFunction &SGF,
     if (!isTake) {                                                             \
       SILValue value = SGF.B.createLoadBorrow(loc, src);                       \
       SILValue strongValue = SGF.B.createStrongCopy##Name##Value(loc, value);  \
-      SGF.B.createEndBorrow(loc, value, src);                                  \
+      SGF.B.createEndBorrow(loc, value);                                       \
       return strongValue;                                                      \
     }                                                                          \
     /* Otherwise perform a load take and destroy the stored value. */          \