Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/IRGen/Outlining.cpp

@@ -35,6 +35,9 @@ void OutliningMetadataCollector::collectTypeMetadataForLayout(SILType type) {
     return;
   }
 
+  // Substitute opaque types if allowed.
+  type = IGF.IGM.substOpaqueTypesWithUnderlyingTypes(type);
+
   auto formalType = type.getASTType();
   auto &ti = IGF.IGM.getTypeInfoForLowered(formalType);
 

test/IRGen/opaque_result_type_substitution.swift

@@ -0,0 +1,32 @@
+// RUN: %target-swift-frontend -disable-availability-checking -emit-ir %s | %FileCheck %s
+
+protocol E {}
+
+struct Pair<T, V> : E {
+  var fst : T
+  var snd : V
+
+  init(_ f: T, _ s: V) {
+    self.fst = f
+    self.snd = s
+  }
+
+  func foobar() -> some E {
+    return self
+  }
+}
+
+public func usePair<T, V>(_ t: T, _ v: V) {
+  var x = Pair(t, v)
+  let q = x.foobar()
+  let u = x.foobar()
+  let p = Pair(q, u)
+  print(p)
+}
+
+// CHECK-LABEL: define{{.*}} swiftcc void @"$s31opaque_result_type_substitution7usePairyyx_q_tr0_lF"({{.*}}, %swift.type* %T, %swift.type* %V)
+// CHECK:  [[PAIR_TV:%.*]] = call swiftcc %swift.metadata_response @"$s31opaque_result_type_substitution4PairVMa"({{.*}}, %swift.type* %T, %swift.type* %V)
+// CHECK:  [[MD:%.*]] = extractvalue %swift.metadata_response [[PAIR_TV]], 0
+// CHECK:  [[PAIR_OPAQUE:%.*]] = call swiftcc %swift.metadata_response @"$s31opaque_result_type_substitution4PairVMa"({{.*}}, %swift.type* [[MD]], %swift.type* [[MD]])
+// CHECK:  [[MD2:%.*]] = extractvalue %swift.metadata_response [[PAIR_OPAQUE]], 0
+// CHECK:  call {{.*}}* @"$s31opaque_result_type_substitution4PairVyAC6foobarQryFQOyxq__Qo_AEGr0_lWOh"({{.*}}, %swift.type* {{.*}}, %swift.type* [[MD2]])