Skip to content

Commit 6f91b41

Browse files
committed
ASTGen/SIL: Suppress retroactive conformance warnings.
When building ASTGen and SIL using the Swift 6.0 compiler the compiler emits diagnostics about various retroactive conformances. Since Swift code in the compiler needs to remain compatible with the Swift 5.10 compiler for now, use module qualification syntax to suppress the warning. I've also included the `@retroactive` attribute in a comment to document the retroactive conformance acknowledgement more explicitly. NFC.
1 parent 88ac67d commit 6f91b41

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

SwiftCompilerSources/Sources/SIL/Utilities/SequenceUtilities.swift

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,28 @@ public extension CollectionLikeSequence {
104104

105105
// Also make the lazy sequences a CollectionLikeSequence if the underlying sequence is one.
106106

107-
extension LazySequence : CollectionLikeSequence,
108-
FormattedLikeArray, CustomStringConvertible, CustomReflectable
107+
extension LazySequence : /*@retroactive*/ SIL.CollectionLikeSequence,
108+
/*@retroactive*/ SIL.FormattedLikeArray,
109+
/*@retroactive*/ Swift.CustomStringConvertible,
110+
/*@retroactive*/ Swift.CustomReflectable
109111
where Base: CollectionLikeSequence {}
110112

111-
extension FlattenSequence : CollectionLikeSequence,
112-
FormattedLikeArray, CustomStringConvertible, CustomReflectable
113+
extension FlattenSequence : /*@retroactive*/ SIL.CollectionLikeSequence,
114+
/*@retroactive*/ SIL.FormattedLikeArray,
115+
/*@retroactive*/ Swift.CustomStringConvertible,
116+
/*@retroactive*/ Swift.CustomReflectable
113117
where Base: CollectionLikeSequence {}
114118

115-
extension LazyMapSequence : CollectionLikeSequence,
116-
FormattedLikeArray, CustomStringConvertible, CustomReflectable
119+
extension LazyMapSequence : /*@retroactive*/ SIL.CollectionLikeSequence,
120+
/*@retroactive*/ SIL.FormattedLikeArray,
121+
/*@retroactive*/ Swift.CustomStringConvertible,
122+
/*@retroactive*/ Swift.CustomReflectable
117123
where Base: CollectionLikeSequence {}
118124

119-
extension LazyFilterSequence : CollectionLikeSequence,
120-
FormattedLikeArray, CustomStringConvertible, CustomReflectable
125+
extension LazyFilterSequence : /*@retroactive*/ SIL.CollectionLikeSequence,
126+
/*@retroactive*/ SIL.FormattedLikeArray,
127+
/*@retroactive*/ Swift.CustomStringConvertible,
128+
/*@retroactive*/ Swift.CustomReflectable
121129
where Base: CollectionLikeSequence {}
122130

123131
//===----------------------------------------------------------------------===//

lib/ASTGen/Sources/ASTGen/Bridge.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ extension BridgedNullable {
2424
}
2525
}
2626

27-
extension BridgedSourceLoc: BridgedNullable {}
28-
extension BridgedIdentifier: BridgedNullable {}
29-
extension BridgedNullableExpr: BridgedNullable {}
30-
extension BridgedNullableStmt: BridgedNullable {}
31-
extension BridgedNullableTypeRepr: BridgedNullable {}
32-
extension BridgedNullablePattern: BridgedNullable {}
33-
extension BridgedNullableGenericParamList: BridgedNullable {}
34-
extension BridgedNullableTrailingWhereClause: BridgedNullable {}
35-
extension BridgedNullableParameterList: BridgedNullable {}
36-
extension BridgedNullablePatternBindingInitializer: BridgedNullable {}
37-
38-
extension BridgedIdentifier: Equatable {
27+
extension BridgedSourceLoc: /*@retroactive*/ swiftASTGen.BridgedNullable {}
28+
extension BridgedIdentifier: /*@retroactive*/ swiftASTGen.BridgedNullable {}
29+
extension BridgedNullableExpr: /*@retroactive*/ swiftASTGen.BridgedNullable {}
30+
extension BridgedNullableStmt: /*@retroactive*/ swiftASTGen.BridgedNullable {}
31+
extension BridgedNullableTypeRepr: /*@retroactive*/ swiftASTGen.BridgedNullable {}
32+
extension BridgedNullablePattern: /*@retroactive*/ swiftASTGen.BridgedNullable {}
33+
extension BridgedNullableGenericParamList: /*@retroactive*/ swiftASTGen.BridgedNullable {}
34+
extension BridgedNullableTrailingWhereClause: /*@retroactive*/ swiftASTGen.BridgedNullable {}
35+
extension BridgedNullableParameterList: /*@retroactive*/ swiftASTGen.BridgedNullable {}
36+
extension BridgedNullablePatternBindingInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable {}
37+
38+
extension BridgedIdentifier: /*@retroactive*/ Swift.Equatable {
3939
public static func == (lhs: Self, rhs: Self) -> Bool {
4040
lhs.raw == rhs.raw
4141
}
@@ -91,7 +91,7 @@ public extension BridgedSourceLoc {
9191
}
9292
}
9393

94-
extension BridgedLabeledStmtInfo: ExpressibleByNilLiteral {
94+
extension BridgedLabeledStmtInfo: /*@retroactive*/ Swift.ExpressibleByNilLiteral {
9595
public init(nilLiteral: ()) {
9696
self.init()
9797
}
@@ -149,7 +149,7 @@ extension BridgedStringRef {
149149
}
150150
}
151151

152-
extension BridgedStringRef: ExpressibleByStringLiteral {
152+
extension BridgedStringRef: /*@retroactive*/ Swift.ExpressibleByStringLiteral {
153153
public init(stringLiteral str: StaticString) {
154154
self.init(data: str.utf8Start, count: str.utf8CodeUnitCount)
155155
}

0 commit comments

Comments
 (0)