Commit 395a05c
committed
ASTMangler: sink fix to be more safe
My previous fix in `6f6a46f` was the correct fix in theory, but in
practice it could accidentally change the mangling of something I
haven't considered, which would break ABI with Swift 6.0
I've narrowed that fix here to only affect dependent conformances
specifically for Copyable/Escapable. The existing code in
`appendDependentProtocolConformance` would always reach a trap because
we're mangling a conformance path that ends with Copyable/Escapable.
We can assume no such symbol has been successfully been mangled before,
thanks to the pre-existing skip in `conformanceRequirementIndex`, so
there's no risk of ABI change.
rdar://135310019
(cherry picked from commit 793b46f)1 parent 968f350 commit 395a05c
1 file changed
+13
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4196 | 4196 | | |
4197 | 4197 | | |
4198 | 4198 | | |
4199 | | - | |
4200 | | - | |
4201 | | - | |
4202 | | - | |
4203 | | - | |
| 4199 | + | |
| 4200 | + | |
| 4201 | + | |
| 4202 | + | |
| 4203 | + | |
| 4204 | + | |
| 4205 | + | |
4204 | 4206 | | |
4205 | 4207 | | |
4206 | 4208 | | |
| 4209 | + | |
| 4210 | + | |
| 4211 | + | |
4207 | 4212 | | |
4208 | 4213 | | |
4209 | 4214 | | |
4210 | 4215 | | |
| 4216 | + | |
| 4217 | + | |
| 4218 | + | |
4211 | 4219 | | |
4212 | 4220 | | |
4213 | 4221 | | |
| |||
0 commit comments