Merge pull request #64884 from nate-chandler/cherrypick/release/5.9/typelowering-lexicality-pack

5.9: [TypeLowering] NFC: Fix lexicality verification for packs and tuples.

Author: swift-ci

lib/SIL/IR/TypeLowering.cpp

@@ -2758,16 +2758,16 @@ bool TypeConverter::visitAggregateLeaves(
                              packIndex);
         }
       } else if (auto tupleTy = ty->getAs<TupleType>()) {
-        for (unsigned tupleIndex = 0, num = tupleTy->getNumElements();
-             tupleIndex < num; ++tupleIndex) {
-          auto origElementTy = origTy.getTupleElementType(tupleIndex);
-          auto substElementTy =
-              tupleTy->getElementType(tupleIndex)->getCanonicalType();
-          substElementTy =
-              computeLoweredRValueType(context, origElementTy, substElementTy);
-          insertIntoWorklist(substElementTy, origElementTy, nullptr,
-                             tupleIndex);
-        }
+        unsigned tupleIndex = 0;
+        origTy.forEachExpandedTupleElement(
+            CanTupleType(tupleTy),
+            [&](auto origElementTy, auto substElementTy, auto element) {
+              substElementTy =
+                  substOpaqueTypesWithUnderlyingTypes(substElementTy, context);
+              insertIntoWorklist(substElementTy, origElementTy, nullptr,
+                                 tupleIndex);
+              ++tupleIndex;
+            });
       } else if (auto *decl = ty->getStructOrBoundGenericStruct()) {
         for (auto *structField : decl->getStoredProperties()) {
           auto subMap = ty->getContextSubstitutionMap(&M, decl);

test/SILGen/variadic-generic-tuples.swift

@@ -284,6 +284,14 @@ func callVariadicMemberwiseInit() -> MemberwiseTupleHolder<Int, String> {
   return MemberwiseTupleHolder(content: (0, "hello"))
 }
 
+@_eagerMove struct MyString {
+  var guts: AnyObject
+}
+
+func callVariadicMemberwiseInit(_ ms: MyString) -> MemberwiseTupleHolder<Int, MyString> {
+  return MemberwiseTupleHolder(content: (0, ms))
+}
+
 // rdar://107151145: when we tuple-destructure a black hole
 // initialization, the resulting element initializations need to
 // handle pack expansion initialization