Merge pull request swiftlang#40726 from nate-chandler/copy-propagation/fixed-assert

[ShrinkBorrowScope] Fixed assert.

Author: nate-chandler

lib/SILOptimizer/Utils/ShrinkBorrowScope.cpp

@@ -298,7 +298,13 @@ void ShrinkBorrowScope::findBarriers() {
       // At that time, it was checked that this block (along with all that
       // successor's other predecessors) had a terminator over which the borrow
       // scope could be shrunk.  Shrink it now.
-      assert(tryHoistOverInstruction(block->getTerminator()));
+#ifndef NDEBUG
+      bool hoisted = 
+#endif
+      tryHoistOverInstruction(block->getTerminator());
+#ifndef NDEBUG
+      assert(hoisted);
+#endif
     }
     SILInstruction *barrier = nullptr;
     while ((instruction = instruction->getPreviousInstruction())) {

test/SILOptimizer/shrink_borrow_scope.sil

@@ -1,7 +1,5 @@
 // RUN: %target-sil-opt -copy-propagation -enable-sil-verify-all %s | %FileCheck %s
 
-// REQUIRES: rdar_86809882
-
 import Builtin
 import Swift