Merge pull request swiftlang#71466 from meg-gupta/lifetimedependencegeneric

Add LifetimeDependence to GenericFunctionType

Author: meg-gupta

include/swift/AST/Types.h

@@ -3866,10 +3866,11 @@ std::string getParamListAsString(ArrayRef<AnyFunctionType::Param> parameters);
 /// on those parameters and dependent member types thereof. The input and
 /// output types of the generic function can be expressed in terms of those
 /// generic parameters.
-class GenericFunctionType final : public AnyFunctionType,
-    public llvm::FoldingSetNode,
-    private llvm::TrailingObjects<GenericFunctionType, AnyFunctionType::Param,
-                                  Type> {
+class GenericFunctionType final
+    : public AnyFunctionType,
+      public llvm::FoldingSetNode,
+      private llvm::TrailingObjects<GenericFunctionType, AnyFunctionType::Param,
+                                    Type, LifetimeDependenceInfo> {
   friend TrailingObjects;
 
   GenericSignature Signature;
@@ -3882,6 +3883,10 @@ class GenericFunctionType final : public AnyFunctionType,
     return hasGlobalActor() + hasThrownError();
   }
 
+  size_t numTrailingObjects(OverloadToken<LifetimeDependenceInfo>) const {
+    return hasLifetimeDependenceInfo() ? 1 : 0;
+  }
+
   /// Construct a new generic function type.
   GenericFunctionType(GenericSignature sig, ArrayRef<Param> params, Type result,
                       llvm::Optional<ExtInfo> info, const ASTContext *ctx,
@@ -3909,7 +3914,17 @@ class GenericFunctionType final : public AnyFunctionType,
       return Type();
     return getTrailingObjects<Type>()[hasGlobalActor()];
   }
-                                    
+
+  LifetimeDependenceInfo getLifetimeDependenceInfo() const {
+    if (!hasLifetimeDependenceInfo()) {
+      return LifetimeDependenceInfo();
+    }
+    auto *info = getTrailingObjects<LifetimeDependenceInfo>();
+    assert(!info->empty() && "If the LifetimeDependenceInfo was empty, we "
+                             "shouldn't have stored it.");
+    return *info;
+  }
+
   /// Retrieve the generic signature of this function type.
   GenericSignature getGenericSignature() const {
     return Signature;

lib/AST/ASTContext.cpp

@@ -4490,9 +4490,13 @@ GenericFunctionType *GenericFunctionType::get(GenericSignature sig,
   if (globalActor && !sig->isReducedType(globalActor))
     isCanonical = false;
 
+  bool hasLifetimeDependenceInfo =
+      info.has_value() && !info.value().getLifetimeDependenceInfo().empty();
+
   unsigned numTypes = (globalActor ? 1 : 0) + (thrownError ? 1 : 0);
-  size_t allocSize = totalSizeToAlloc<AnyFunctionType::Param, Type>(
-      params.size(), numTypes);
+  size_t allocSize =
+      totalSizeToAlloc<AnyFunctionType::Param, Type, LifetimeDependenceInfo>(
+          params.size(), numTypes, hasLifetimeDependenceInfo ? 1 : 0);
   void *mem = ctx.Allocate(allocSize, alignof(GenericFunctionType));
 
   auto properties = getGenericFunctionRecursiveProperties(params, result);
@@ -4522,6 +4526,11 @@ GenericFunctionType::GenericFunctionType(
     }
     if (Type thrownError = info->getThrownError())
       getTrailingObjects<Type>()[thrownErrorIndex] = thrownError;
+
+    auto lifetimeDependenceInfo = info->getLifetimeDependenceInfo();
+    if (!lifetimeDependenceInfo.empty()) {
+      *getTrailingObjects<LifetimeDependenceInfo>() = lifetimeDependenceInfo;
+    }
   }
 }
 

lib/AST/Type.cpp

@@ -4121,8 +4121,7 @@ LifetimeDependenceInfo AnyFunctionType::getLifetimeDependenceInfo() const {
   case TypeKind::Function:
     return cast<FunctionType>(this)->getLifetimeDependenceInfo();
   case TypeKind::GenericFunction:
-    // TODO: Handle GenericFunction
-    return LifetimeDependenceInfo();
+    return cast<GenericFunctionType>(this)->getLifetimeDependenceInfo();
 
   default:
     llvm_unreachable("Illegal type kind for AnyFunctionType.");

test/SIL/explicit_lifetime_dependence_specifiers.swift

@@ -5,7 +5,6 @@
 // RUN: -disable-experimental-parser-round-trip \
 // RUN: -enable-experimental-feature NoncopyableGenerics \
 // RUN: -enable-experimental-lifetime-dependence-inference | %FileCheck %s
-// REQUIRES: asserts
 // REQUIRES: noncopyable_generics
 
 import Builtin
@@ -48,7 +47,6 @@ struct MutableBufferView : ~Escapable, ~Copyable {
   }
 }
 
-/*
 // rdar://121983770
 func testBasic() {
   let capacity = 4
@@ -60,7 +58,6 @@ func testBasic() {
     use(newView)    
   }
 }
-*/
 
 // CHECK-LABEL: sil hidden @$s39explicit_lifetime_dependence_specifiers6deriveyAA10BufferViewVADF : $@convention(thin) (@guaranteed BufferView) -> _borrow(1) @owned BufferView {
 func derive(_ x: borrowing BufferView) -> _borrow(x) BufferView {

test/SIL/lifetime_dependence_generics.swift

@@ -0,0 +1,38 @@
+// RUN: %target-swift-frontend %s -emit-sil \
+// RUN:   -disable-experimental-parser-round-trip \
+// RUN:   -enable-experimental-feature NonescapableTypes \
+// RUN:   -enable-experimental-feature NoncopyableGenerics \
+// RUN:   -enable-experimental-lifetime-dependence-inference | %FileCheck %s
+// REQUIRES: noncopyable_generics
+
+protocol P {
+  associatedtype E: ~Escapable
+  borrowing func getE() -> _borrow(self) E
+}
+
+extension P {
+  borrowing func getDefault() -> _borrow(self) E {
+    return getE()
+  }
+}
+
+public struct View: ~Escapable {
+  @_unsafeNonescapableResult
+  init() { }
+}
+
+public struct PView: P {
+  borrowing func getE() -> _borrow(self) View { return View() }
+}
+
+public func test(pview: consuming PView) -> _consume(pview) View {
+  return pview.getDefault()
+}
+
+// CHECK: sil hidden @$s28lifetime_dependence_generics1PPAAE10getDefault1EQzyF : $@convention(method) <Self where Self : P> (@in_guaranteed Self) -> _borrow(0) @out Self.E {
+
+// CHECK: sil hidden @$s28lifetime_dependence_generics5PViewV4getEAA4ViewVyF : $@convention(method) (PView) -> _borrow(0) @owned View {
+
+// CHECK: sil private [transparent] [thunk] @$s28lifetime_dependence_generics5PViewVAA1PA2aDP4getE1EQzyFTW : $@convention(witness_method: P) (@in_guaranteed PView) -> _borrow(0) @out View {
+
+// CHECK: sil @$s28lifetime_dependence_generics4test5pviewAA4ViewVAA5PViewVn_tF : $@convention(thin) (PView) -> _inherit(1) @owned View {

test/Sema/explicit_lifetime_dependence_specifiers.swift

@@ -129,10 +129,3 @@ struct Wrapper : ~Escapable {
     return view
   } 
 }
-
-struct ArrayOfBufferView : ~Escapable {
-    let arr: [BufferView]
-    subscript(index: Int) -> _borrow(self) BufferView {
-        return arr[index]
-    }
-}