Commit a723538
committed
Sema: Only diagnose retroactive conformances once.
A type may conform to a single protocol via multiple inheritance clauses on the
same extension. When this occurs, we must be careful to only diagnose that
conformance as needing `@retroactive` once, or not at all if one of those
clauses is marked `@retroactive`.
Resolves rdar://1214790471 parent 4112618 commit a723538
File tree
2 files changed
+30
-1
lines changed- lib/Sema
- test/Sema
2 files changed
+30
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1641 | 1641 | | |
1642 | 1642 | | |
1643 | 1643 | | |
| 1644 | + | |
1644 | 1645 | | |
1645 | 1646 | | |
1646 | 1647 | | |
| |||
1665 | 1666 | | |
1666 | 1667 | | |
1667 | 1668 | | |
1668 | | - | |
1669 | 1669 | | |
1670 | 1670 | | |
1671 | 1671 | | |
| |||
1701 | 1701 | | |
1702 | 1702 | | |
1703 | 1703 | | |
| 1704 | + | |
| 1705 | + | |
| 1706 | + | |
| 1707 | + | |
1704 | 1708 | | |
1705 | 1709 | | |
1706 | 1710 | | |
| |||
1712 | 1716 | | |
1713 | 1717 | | |
1714 | 1718 | | |
| 1719 | + | |
| 1720 | + | |
| 1721 | + | |
| 1722 | + | |
| 1723 | + | |
1715 | 1724 | | |
1716 | 1725 | | |
1717 | 1726 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
9 | 11 | | |
10 | 12 | | |
11 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
12 | 19 | | |
13 | 20 | | |
14 | 21 | | |
| |||
36 | 43 | | |
37 | 44 | | |
38 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
39 | 59 | | |
40 | 60 | | |
41 | 61 | | |
| |||
0 commit comments