Merge pull request #24266 from rjmccall/retro-self-conf-mangling

swift-ci · web-flow · commit e73f50506a5f · 2019-04-24T23:24:03.000-07:00
diff --git a/test/SILGen/Inputs/RetroactiveB.swift b/test/SILGen/Inputs/RetroactiveB.swift
@@ -1,2 +1,3 @@
 public struct X { }
 public struct Y { }
+public struct ExternalGeneric<Argument> {}
diff --git a/test/SILGen/mangling_retroactive.swift b/test/SILGen/mangling_retroactive.swift
@@ -87,3 +87,8 @@ extension ConditionallyP2: P where T: Q, T: NonRetroactive {}
 
 func useConditionallyP2(_: RequiresP<ConditionallyP2<Y>>) {}
 // CHECK: sil hidden [ossa] @$s20mangling_retroactive18useConditionallyP2yyAA9RequiresPVyAA0dE0Vy12RetroactiveB1YVGAJ0G1A1PHPAiK1QAAyHC_AiA03NonG0HpyHCHCg_GF
+
+struct RequiresError<T> where T: Error { }
+extension ExternalGeneric: Error where Argument: Error { }
+func useRequiresError(_: RequiresError<ExternalGeneric<Error>>) {}
+// CHECK: sil hidden [ossa] @$s20mangling_retroactive16useRequiresErroryyAA0dE0Vy12RetroactiveB15ExternalGenericVys0E0_pGAIsAhAsAH_psAHHPyHC_HCg_GF

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`public struct X { }`
`2`	`2`	`public struct Y { }`
	`3`	`+public struct ExternalGeneric<Argument> {}`