Enable lifetime dependence inference on parameters with just ownership modifiers

Author: meg-gupta

lib/Sema/LifetimeDependence.cpp

@@ -293,19 +293,21 @@ LifetimeDependenceInfo::infer(AbstractFunctionDecl *afd, Type resultType) {
     if (param->getValueOwnership() == ValueOwnership::Default) {
       continue;
     }
+    if (param->getValueOwnership() == ValueOwnership::Owned &&
+        paramTypeInContext->isEscapable()) {
+      continue;
+    }
 
-    if (!paramTypeInContext->isEscapable() ||
-        paramTypeInContext->isNoncopyable()) {
-      if (candidateParam) {
-        diags.diagnose(
-            returnLoc,
-            diag::lifetime_dependence_cannot_infer_wo_ambiguous_candidate);
-        return llvm::None;
-      }
-      candidateParam = param;
-      lifetimeDependenceInfo = LifetimeDependenceInfo::getForParamIndex(
-          afd, paramIndex + 1, param->getValueOwnership());
+    if (candidateParam) {
+      diags.diagnose(
+          returnLoc,
+          diag::lifetime_dependence_cannot_infer_ambiguous_candidate);
+      return llvm::None;
     }
+    candidateParam = param;
+    lifetimeDependenceInfo = LifetimeDependenceInfo::getForParamIndex(
+        afd, paramIndex + 1, param->getValueOwnership());
+
     paramIndex++;
   }
   if (!candidateParam && !hasParamError) {

test/SIL/implicit_lifetime_dependence.swift

@@ -24,6 +24,10 @@ struct BufferView : ~Escapable {
   init(_ otherBV: consuming BufferView) {
     self.ptr = otherBV.ptr
   }
+// CHECK: sil hidden @$s28implicit_lifetime_dependence10BufferViewVyACSW_SaySiGhtcfC : $@convention(method) (UnsafeRawBufferPointer, @guaranteed Array<Int>, @thin BufferView.Type) -> _scope(1) @owned BufferView {
+  init(_ ptr: UnsafeRawBufferPointer, _ a: borrowing Array<Int>) {
+    self.ptr = ptr
+  }
 }
 
 struct MutableBufferView : ~Escapable, ~Copyable {