Merge pull request #64971 from nate-chandler/rdar107709069

[TypeLowering] Fixed verifier variable shadowing.

Author: nate-chandler

lib/SIL/IR/TypeLowering.cpp

@@ -2745,7 +2745,7 @@ bool TypeConverter::visitAggregateLeaves(
     Optional<unsigned> maybeIndex;
     if (index != UINT_MAX)
       maybeIndex = {index};
-    return {ty, origTy, field, index};
+    return {ty, origTy, field, maybeIndex};
   };
   auto isAggregate = [](CanType ty) {
     return isa<SILPackType>(ty) ||
@@ -2761,6 +2761,7 @@ bool TypeConverter::visitAggregateLeaves(
     ValueDecl *field;
     Optional<unsigned> index;
     std::tie(ty, origTy, field, index) = popFromWorklist();
+    assert(!field || !index && "both field and index!?");
     if (isAggregate(ty) && !isLeafAggregate(ty, origTy, field, index)) {
       if (auto packTy = dyn_cast<SILPackType>(ty)) {
         for (auto packIndex : indices(packTy->getElementTypes())) {

test/SILGen/lexical_lifetime.swift

@@ -26,6 +26,10 @@ enum E {
 @_silgen_name("use_generic")
 func use_generic<T>(_ t: T) {}
 
+struct NonlexicalBox<X> {
+  @_eagerMove var x: X
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Declarations                                                               }}
 ////////////////////////////////////////////////////////////////////////////////
@@ -147,6 +151,8 @@ extension C {
   func eagermove_method_attr() {}
 }
 
+func f<T>() -> (NonlexicalBox<T>) {}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Test                                                                       }}
 ////////////////////////////////////////////////////////////////////////////////