Merge pull request #39880 from kubamracek/revert-df26a6d7407d42e9646c883489ced31ceb700674

Revert "Merge pull request #39805 from atrick/oou-opt-rauw"

Author: atrick

lib/SILOptimizer/Utils/OwnershipOptUtils.cpp

@@ -350,11 +350,6 @@ static bool canFixUpOwnershipForRAUW(SILValue oldValue, SILValue newValue,
   if (oldValue.getOwnershipKind() != OwnershipKind::Guaranteed)
     return true;
 
-  SILValue newRoot = findOwnershipReferenceAggregate(newValue);
-  if (newRoot && isa<SILFunctionArgument>(newRoot)
-      && newRoot->getOwnershipKind() == OwnershipKind::Guaranteed) {
-    return true;
-  }
   // Check that the old lifetime can be extended and record the necessary
   // book-keeping in the OwnershipFixupContext.
   context.clear();
@@ -875,10 +870,9 @@ SILValue
 OwnershipLifetimeExtender::borrowOverValue(SILValue newValue,
                                            SILValue guaranteedValue) {
   // Avoid borrowing guaranteed function arguments.
-  if (newValue.getOwnershipKind() == OwnershipKind::Guaranteed) {
-    SILValue newRoot = findOwnershipReferenceAggregate(newValue);
-    if (newRoot && isa<SILFunctionArgument>(newRoot))
-      return newValue;
+  if (isa<SILFunctionArgument>(newValue)
+      && newValue.getOwnershipKind() == OwnershipKind::Guaranteed) {
+    return newValue;
   }
   auto borrowedValue = BorrowedValue(guaranteedValue);
   if (borrowedValue && borrowedValue.isLocalScope()) {