This repository was archived by the owner on May 28, 2025. It is now read-only.
Commit 70e1d23
committed
CFI: Pad out associated type resolution with erased lifetimes
`trait_object_ty` assumed that associated types would be fully
determined by the trait. This is *almost* true - const parameters and
type parameters are no longer allowed, but lifetime parameters are.
Since we erase all lifetime parameters anyways, instantiate it with as
many erased regions as it needs.
Fixes: rust-lang#1230531 parent 60b5ca6 commit 70e1d23
File tree
2 files changed
+46
-3
lines changed- compiler/rustc_symbol_mangling/src/typeid
- tests/ui/sanitizer
2 files changed
+46
-3
lines changedLines changed: 8 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1124 | 1124 | | |
1125 | 1125 | | |
1126 | 1126 | | |
1127 | | - | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
1128 | 1131 | | |
1129 | 1132 | | |
1130 | 1133 | | |
| |||
1152 | 1155 | | |
1153 | 1156 | | |
1154 | 1157 | | |
1155 | | - | |
1156 | | - | |
| 1158 | + | |
| 1159 | + | |
1157 | 1160 | | |
1158 | 1161 | | |
1159 | 1162 | | |
| |||
1182 | 1185 | | |
1183 | 1186 | | |
1184 | 1187 | | |
| 1188 | + | |
1185 | 1189 | | |
1186 | 1190 | | |
1187 | 1191 | | |
| |||
1199 | 1203 | | |
1200 | 1204 | | |
1201 | 1205 | | |
| 1206 | + | |
1202 | 1207 | | |
1203 | 1208 | | |
1204 | 1209 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
0 commit comments