Merge pull request #73182 from eeckstein/fix-reabstraction-info-6.0

[6.0] embedded: fix a crash when specializing a generic class method with an indirect return value

Author: eeckstein

lib/SILOptimizer/Utils/Generics.cpp

@@ -813,7 +813,7 @@ getReturnTypeCategory(const SILResultInfo &RI,
                   const SILFunctionConventions &substConv,
                   TypeExpansionContext typeExpansion) {
   auto ResultTy = substConv.getSILType(RI, typeExpansion);
-  ResultTy = Callee->mapTypeIntoContext(ResultTy);
+  ResultTy = mapTypeIntoContext(ResultTy);
   auto &TL = getModule().Types.getTypeLowering(ResultTy, typeExpansion);
 
   if (!TL.isLoadable())

test/embedded/classes-indirect-return.swift

@@ -0,0 +1,26 @@
+// RUN: %target-swift-emit-sil %s -enable-experimental-feature Embedded -wmo | %FileCheck %s
+
+// REQUIRES: swift_in_compiler
+// REQUIRES: OS=macosx || OS=linux-gnu
+
+// CHECK: sil @$s4main1XC3fooxyFSi_Tg5 : $@convention(method) (@guaranteed X<Int>) -> Int {
+
+// CHECK-LABEL: sil_vtable $X<Int>
+// CHECK:         #X.foo: <T> (X<T>) -> () -> T : @$s4main1XC3fooxyFSi_Tg5
+// CHECK:       }
+
+open class X<T> {
+
+  var t: T
+
+  init(t: T) {
+    self.t = t
+  }
+
+  open func foo() -> T { t }
+}
+
+func testit() -> Int {
+  let x = X(t: 27)
+  return x.foo()
+}