Merge pull request #84763 from nate-chandler/cherrypick/release/6.2/rdar161606892_2

6.2: [VariadicGenerics] Fix memeffect of metadata accessor.

Author: nate-chandler

include/swift/IRGen/GenericRequirement.h

@@ -109,6 +109,11 @@ class GenericRequirement {
   bool isAnyWitnessTable() const {
     return kind == Kind::WitnessTable || kind == Kind::WitnessTablePack;
   }
+
+  bool isAnyPack() const {
+    return kind == Kind::MetadataPack || kind == Kind::WitnessTablePack;
+  }
+
   bool isValue() const {
     return kind == Kind::Value;
   }

lib/IRGen/GenMeta.cpp

@@ -2996,8 +2996,9 @@ void irgen::emitLazyMetadataAccessor(IRGenModule &IGM,
   if (IGM.getOptions().optimizeForSize())
     accessor->addFnAttr(llvm::Attribute::NoInline);
 
-  bool isReadNone = (genericArgs.Types.size() <=
-                     NumDirectGenericTypeMetadataAccessFunctionArgs);
+  bool isReadNone =
+      !genericArgs.hasPacks && (genericArgs.Types.size() <=
+                                NumDirectGenericTypeMetadataAccessFunctionArgs);
 
   emitCacheAccessFunction(
       IGM, accessor, /*cache*/ nullptr, /*cache type*/ nullptr,

lib/IRGen/GenericArguments.h

@@ -50,15 +50,17 @@ struct GenericArguments {
   /// The values to use to initialize the arguments structure.
   SmallVector<llvm::Value *, 8> Values;
   SmallVector<llvm::Type *, 8> Types;
+  bool hasPacks = false;
 
- void collectTypes(IRGenModule &IGM, NominalTypeDecl *nominal) {
+  void collectTypes(IRGenModule &IGM, NominalTypeDecl *nominal) {
     GenericTypeRequirements requirements(IGM, nominal);
     collectTypes(IGM, requirements);
   }
 
   void collectTypes(IRGenModule &IGM,
                     const GenericTypeRequirements &requirements) {
     for (auto &requirement : requirements.getRequirements()) {
+      hasPacks = hasPacks || requirement.isAnyPack();
       Types.push_back(requirement.getType(IGM));
     }
   }

lib/IRGen/IRGenFunction.h

@@ -395,9 +395,8 @@ class IRGenFunction {
 
   // Emit a call to the given generic type metadata access function.
   MetadataResponse emitGenericTypeMetadataAccessFunctionCall(
-                                          llvm::Function *accessFunction,
-                                          ArrayRef<llvm::Value *> args,
-                                          DynamicMetadataRequest request);
+      llvm::Function *accessFunction, ArrayRef<llvm::Value *> args,
+      DynamicMetadataRequest request, bool hasPacks = false);
 
   // Emit a reference to the canonical type metadata record for the given AST
   // type. This can be used to identify the type at runtime. For types with

lib/IRGen/MetadataRequest.cpp

@@ -750,7 +750,7 @@ static MetadataResponse emitNominalMetadataRef(IRGenFunction &IGF,
             theDecl, genericArgs.Types, NotForDefinition);
 
     response = IGF.emitGenericTypeMetadataAccessFunctionCall(
-        accessor, genericArgs.Values, request);
+        accessor, genericArgs.Values, request, genericArgs.hasPacks);
   }
 
   IGF.setScopedLocalTypeMetadata(theType, response);
@@ -2467,11 +2467,9 @@ void irgen::emitCacheAccessFunction(IRGenModule &IGM, llvm::Function *accessor,
   IGF.Builder.CreateRet(ret);
 }
 
-MetadataResponse
-IRGenFunction::emitGenericTypeMetadataAccessFunctionCall(
-                                              llvm::Function *accessFunction,
-                                              ArrayRef<llvm::Value *> args,
-                                              DynamicMetadataRequest request) {
+MetadataResponse IRGenFunction::emitGenericTypeMetadataAccessFunctionCall(
+    llvm::Function *accessFunction, ArrayRef<llvm::Value *> args,
+    DynamicMetadataRequest request, bool hasPacks) {
 
   SmallVector<llvm::Value *, 8> callArgs;
 
@@ -2495,7 +2493,7 @@ IRGenFunction::emitGenericTypeMetadataAccessFunctionCall(
                                  accessFunction, callArgs);
   call->setDoesNotThrow();
   call->setCallingConv(IGM.SwiftCC);
-  call->setMemoryEffects(allocatedArgsBuffer
+  call->setMemoryEffects(hasPacks || allocatedArgsBuffer
                              ? llvm::MemoryEffects::inaccessibleOrArgMemOnly()
                              : llvm::MemoryEffects::none());
 

validation-test/IRGen/rdar161606892.swift

@@ -0,0 +1,8 @@
+// RUN: %target-swift-frontend %s -target %target-swift-5.9-abi-triple -emit-irgen | %IRGenFileCheck %s
+
+// CHECK: Attrs: noinline nounwind{{$}}
+// CHECK-NEXT: define {{.*}}@"$s13rdar1616068921PVMa"
+
+public struct P<each T> {
+  public var teas: (repeat each T)
+}

validation-test/IRGen/rdar161606892_2.swift

@@ -0,0 +1,40 @@
+// RUN: %empty-directory(%t)
+// RUN: split-file %s %t
+
+// RUN: %target-build-swift \
+// RUN:     -emit-module \
+// RUN:     -target %target-swift-5.9-abi-triple \
+// RUN:     %t/Library.swift \
+// RUN:     -parse-as-library \
+// RUN:     -module-name Library \
+// RUN:     -emit-module-path %t/Library.swiftmodule
+
+// RUN: %target-swift-frontend                              \
+// RUN:     %t/Downstream.swift                             \
+// RUN:     -emit-irgen                                     \
+// RUN:     -target %target-swift-5.9-abi-triple            \
+// RUN:     -module-name main                               \
+// RUN:     -lLibrary                                       \
+// RUN:     -I %t                                           \
+// RUN: | %FileCheck %t/Downstream.swift --check-prefixes=CHECK,CHECK-OLD
+
+//--- Library.swift
+
+public struct Pack<each T> {
+  public init() {}
+}
+
+public func sink<T>(_ t: T) {}
+
+//--- Downstream.swift
+
+import Library
+
+// CHECK: doit
+// CHECK: @"$s7Library4PackVMa"{{.*}} [[CALL:#[^,]+]]
+
+// CHECK: attributes [[CALL]] = { nounwind memory(argmem: readwrite, inaccessiblemem: readwrite) }
+@_silgen_name("doit")
+func doit<each T, each U>(ts: repeat each T, us: repeat each U) {
+  sink(Pack<repeat each T, repeat each U>())
+}