Merge pull request #11277 from atrick/borrow_guaranteed

Author: swift-ci

lib/SILGen/SILGenApply.cpp

@@ -2921,9 +2921,10 @@ class ArgEmitter {
       return;
     }
 
-    if (SGF.F.getModule().getOptions().EnableSILOwnership) {
-      if (param.isDirectGuaranteed() &&
-          value.getOwnershipKind() == ValueOwnershipKind::Owned) {
+    if (SGF.F.getModule().getOptions().EnableSILOwnership
+        && value.getOwnershipKind() == ValueOwnershipKind::Owned) {
+      if (param.isDirectGuaranteed() || (!SGF.silConv.useLoweredAddresses()
+                                         && param.isIndirectInGuaranteed())) {
         value = value.borrow(SGF, loc);
         Args.push_back(value);
         return;

test/SILGen/opaque_ownership.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-sil-opaque-values -enable-sil-ownership -emit-sorted-sil -Xllvm -sil-full-demangle -emit-silgen -parse-stdlib -parse-as-library %s | %FileCheck %s
+// RUN: %target-swift-frontend -enable-sil-opaque-values -enable-sil-ownership -emit-sorted-sil -Xllvm -sil-full-demangle -emit-silgen -parse-stdlib -parse-as-library -module-name Swift %s | %FileCheck %s
 
 public protocol UnkeyedDecodingContainer {
   var isAtEnd: Builtin.Int1 { get }
@@ -10,7 +10,7 @@ public protocol Decoder {
 
 // Test open_existential_value ownership
 // ---
-// CHECK-LABEL: sil @_T016opaque_ownership11takeDecoderBi1_AA0D0_p4from_tKF : $@convention(thin) (@in Decoder) -> (Builtin.Int1, @error Builtin.NativeObject) {
+// CHECK-LABEL: sil @_T0s11takeDecoderBi1_s0B0_p4from_tKF : $@convention(thin) (@in Decoder) -> (Builtin.Int1, @error Builtin.NativeObject) {
 // CHECK: bb0(%0 : @owned $Decoder):
 // CHECK:  [[BORROW1:%.*]] = begin_borrow %0 : $Decoder
 // CHECK:  [[OPENED:%.*]] = open_existential_value [[BORROW1]] : $Decoder to $@opened("{{.*}}") Decoder
@@ -27,8 +27,59 @@ public protocol Decoder {
 // CHECK:  destroy_value [[RET1]] : $UnkeyedDecodingContainer
 // CHECK:  destroy_value %0 : $Decoder
 // CHECK:  return [[RET2]] : $Builtin.Int1
-// CHECK-LABEL: } // end sil function '_T016opaque_ownership11takeDecoderBi1_AA0D0_p4from_tKF'
+// CHECK-LABEL: } // end sil function '_T0s11takeDecoderBi1_s0B0_p4from_tKF'
 public func takeDecoder(from decoder: Decoder) throws -> Builtin.Int1 {
   let container = try decoder.unkeyedContainer()
   return container.isAtEnd
 }
+
+public enum Optional<Wrapped> {
+  case none
+  case some(Wrapped)
+}
+
+public protocol IP {}
+
+public protocol Seq {
+  associatedtype Iterator : IP
+
+  func makeIterator() -> Iterator
+}
+
+extension Seq where Self.Iterator == Self {
+  public func makeIterator() -> Self {
+    return self
+  }
+}
+
+public struct EnumIter<Base : IP> : IP, Seq {
+  internal var _base: Base
+
+  public typealias Iterator = EnumIter<Base>
+}
+
+// Test passing a +1 RValue to @in_guaranteed.
+// ---
+// CHECK-LABEL: sil @_T0s7EnumSeqV12makeIterators0A4IterVy0D0QzGyF : $@convention(method) <Base where Base : Seq> (@in_guaranteed EnumSeq<Base>) -> @out EnumIter<Base.Iterator> {
+// CHECK: bb0(%0 : @guaranteed $EnumSeq<Base>):
+// CHECK: [[FN:%.*]] = function_ref @_T0s8EnumIterVAByxGx5_base_tcfC : $@convention(method) <τ_0_0 where τ_0_0 : IP> (@in τ_0_0, @thin EnumIter<τ_0_0>.Type) -> @out EnumIter<τ_0_0>
+// CHECK:  [[MT:%.*]] = metatype $@thin EnumIter<Base.Iterator>.Type
+// CHECK:  [[WT:%.*]] = witness_method $Base, #Seq.makeIterator!1 : <Self where Self : Seq> (Self) -> () -> Self.Iterator : $@convention(witness_method) <τ_0_0 where τ_0_0 : Seq> (@in_guaranteed τ_0_0) -> @out τ_0_0.Iterator
+// CHECK:  [[FIELD:%.*]] = struct_extract %0 : $EnumSeq<Base>, #EnumSeq._base
+// CHECK:  [[COPY:%.*]] = copy_value [[FIELD]] : $Base
+// CHECK:  [[BORROW:%.*]] = begin_borrow [[COPY]] : $Base
+// CHECK:  [[ITER:%.*]] = apply [[WT]]<Base>([[BORROW]]) : $@convention(witness_method) <τ_0_0 where τ_0_0 : Seq> (@in_guaranteed τ_0_0) -> @out τ_0_0.Iterator
+// CHECK:  end_borrow [[BORROW]] from [[COPY]] : $Base, $Base
+// CHECK:  destroy_value [[COPY]] : $Base
+// CHECK:  [[RET:%.*]] = apply [[FN]]<Base.Iterator>([[ITER]], [[MT]]) : $@convention(method) <τ_0_0 where τ_0_0 : IP> (@in τ_0_0, @thin EnumIter<τ_0_0>.Type) -> @out EnumIter<τ_0_0>
+// CHECK:  return [[RET]] : $EnumIter<Base.Iterator>
+// CHECK-LABEL: } // end sil function '_T0s7EnumSeqV12makeIterators0A4IterVy0D0QzGyF'
+public struct EnumSeq<Base : Seq> : Seq {
+  public typealias Iterator = EnumIter<Base.Iterator>
+
+  internal var _base: Base
+
+  public func makeIterator() -> Iterator {
+    return EnumIter(_base: _base.makeIterator())
+  }
+}