Merge pull request #62832 from eeckstein/fix-keypath-opt-crash-5.8

[5.8] SILCombine: fix a crash when optimizing keypath-offset-of

Author: eeckstein

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -343,8 +343,11 @@ bool SILCombiner::tryOptimizeKeypathOffsetOf(ApplyInst *AI,
 
   KeyPathPattern *pattern = kp->getPattern();
   SubstitutionMap patternSubs = kp->getSubstitutions();
-  CanType rootTy = pattern->getRootType().subst(patternSubs)->getCanonicalType();
-  CanType parentTy = rootTy;
+  SILFunction *f = AI->getFunction();
+  SILType rootTy = f->getLoweredType(Lowering::AbstractionPattern::getOpaque(),
+      pattern->getRootType().subst(patternSubs)->getCanonicalType());
+
+  SILType parentTy = rootTy;
 
   // First check if _storedInlineOffset would return an offset or nil. Basically
   // only stored struct and tuple elements produce an offset. Everything else
@@ -381,14 +384,15 @@ bool SILCombiner::tryOptimizeKeypathOffsetOf(ApplyInst *AI,
       hasOffset = false;
       break;
     }
-    parentTy = component.getComponentType();
+    parentTy = f->getLoweredType(Lowering::AbstractionPattern::getOpaque(),
+                                 component.getComponentType());
   }
 
   SILLocation loc = AI->getLoc();
   SILValue result;
 
   if (hasOffset) {
-    SILType rootAddrTy = SILType::getPrimitiveAddressType(rootTy);
+    SILType rootAddrTy = rootTy.getAddressType();
     SILValue rootAddr = Builder.createBaseAddrForOffset(loc, rootAddrTy);
 
     auto projector = KeyPathProjector::create(kp, rootAddr, loc, Builder);

test/SILOptimizer/keypath_offset.swift

@@ -61,6 +61,8 @@ struct TupleProperties {
 
 typealias Tuple<T, U> = (S<T>, C<U>)
 
+typealias TupleOfFunctions = (a: @convention(c) () -> (), b: @convention(c) () -> ())
+
 func getIdentityKeyPathOfType<T>(_: T.Type) -> KeyPath<T, T> {
   return \.self
 }
@@ -157,6 +159,15 @@ func testTupleOffsets() {
   printOffset(TLayout.offset(of: \Tuple<Int, Int>.1))
 }
 
+// CHECK-LABEL: sil {{.*}} @$s4test0A16TupleOfFunctionsyyF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A16TupleOfFunctionsyyF'
+@inline(never)
+func testTupleOfFunctions() {
+  printOffset(MemoryLayout<TupleOfFunctions>.offset(of: \.b))
+}
+
 // CHECK-LABEL: sil {{.*}} @$s4test0A19GenericTupleOffsetsyyxmlF
 // CHECK-NOT:     _storedInlineOffset
 // CHECK-NOT:     class_method
@@ -194,4 +205,6 @@ print("### testGenericTupleOffsets")
 testGenericTupleOffsets(Int.self)
 print("### testResilientOffsets")
 testResilientOffsets()
+print("### testTupleOfFunctions")
+testTupleOfFunctions()