Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit cd6819015468 · 2023-08-23T23:54:50.000-07:00
diff --git a/lib/SILGen/SILGenFunction.cpp b/lib/SILGen/SILGenFunction.cpp
@@ -677,7 +677,6 @@ void SILGenFunction::emitCaptures(SILLocation loc,
           // Otherwise, just return it, copying if needed.
           if (forceCopy && !lowering.isTrivial()) {
             auto result = B.emitCopyValueOperation(loc, entryValue);
-            // enterDestroyCleanup(result);
             return result;
           }
           return entryValue;

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,6 @@ void SILGenFunction::emitCaptures(SILLocation loc,`
`677`	`677`	`// Otherwise, just return it, copying if needed.`
`678`	`678`	`if (forceCopy && !lowering.isTrivial()) {`
`679`	`679`	`auto result = B.emitCopyValueOperation(loc, entryValue);`
`680`		`- // enterDestroyCleanup(result);`
`681`	`680`	`return result;`
`682`	`681`	`}`
`683`	`682`	`return entryValue;`