Merge pull request #73673 from jckarter/no-implicit-copy-strip-move-only-wrapper-6.0

[6.0] SILGen: Bug fix handling `consuming`/`borrowing` parameters and optional chaining.

Author: jckarter

lib/SILGen/SILGenLValue.cpp

@@ -4411,6 +4411,13 @@ LValue SILGenLValue::visitBindOptionalExpr(BindOptionalExpr *e,
 
     if (optBase.getType().isMoveOnly()) {
       if (optBase.getType().isAddress()) {
+        // Strip the move-only wrapper if any.
+        if (optBase.getType().isMoveOnlyWrapped()) {
+          optBase = ManagedValue::forBorrowedAddressRValue(
+            SGF.B.createMoveOnlyWrapperToCopyableAddr(e,
+                                                      optBase.getValue()));
+        }
+      
         optBase = enterAccessScope(SGF, e, ManagedValue(),
                                    optBase, optTypeData,
                                    baseAccessKind,
@@ -4423,13 +4430,26 @@ LValue SILGenLValue::visitBindOptionalExpr(BindOptionalExpr *e,
       } else {
         optBase = SGF.B.createFormalAccessBeginBorrow(e, optBase, IsNotLexical,
                                                       BeginBorrowInst::IsFixed);
+        // Strip the move-only wrapper if any.
+        if (optBase.getType().isMoveOnlyWrapped()) {
+          optBase
+            = SGF.B.createGuaranteedMoveOnlyWrapperToCopyableValue(e, optBase);
+        }
       }
     }
   } else {
     optBase = SGF.emitAddressOfLValue(e, std::move(optLV));
+    bool isMoveOnly = optBase.getType().isMoveOnly();
+    
+    // Strip the move-only wrapper if any.
+    if (optBase.getType().isMoveOnlyWrapped()) {
+      optBase = ManagedValue::forLValue(
+        SGF.B.createMoveOnlyWrapperToCopyableAddr(e,
+                                                  optBase.getValue()));
+    }
 
     if (isConsumeAccess(baseAccessKind)) {
-      if (optBase.getType().isMoveOnly()) {
+      if (isMoveOnly) {
         optBase = enterAccessScope(SGF, e, ManagedValue(),
                                    optBase, optTypeData,
                                    baseAccessKind,

test/SILGen/unmanaged-chain.swift

@@ -0,0 +1,15 @@
+// RUN: %target-swift-emit-silgen -verify %s
+
+extension Unmanaged {
+    func something1(with x: consuming Unmanaged<Instance>?) -> UnsafeMutableRawPointer? {
+        x?.toOpaque()
+    }
+
+    func something2(with x: consuming Unmanaged<Instance>?) -> UnsafeMutableRawPointer? {
+        let y = x
+        return y?.toOpaque()
+    }
+    func something3(with x: __owned Unmanaged<Instance>?) -> UnsafeMutableRawPointer? {
+        x?.toOpaque()
+    }
+}