Skip to content

Commit fce3adb

Browse files
authored
Merge pull request #85132 from tshortli/fix-warnings
Fix various warnings
2 parents 03d61ed + d6c9080 commit fce3adb

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

lib/ASTGen/Sources/ASTGen/Bridge.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ extension BridgedNullable {
3131
}
3232
}
3333

34-
extension SourceLoc: /*@retroactive*/ swiftASTGen.BridgedNullable {}
35-
extension Identifier: /*@retroactive*/ swiftASTGen.BridgedNullable {}
36-
extension BridgedNullableDecl: /*@retroactive*/ swiftASTGen.BridgedNullable {}
37-
extension BridgedNullableExpr: /*@retroactive*/ swiftASTGen.BridgedNullable {}
38-
extension BridgedNullableStmt: /*@retroactive*/ swiftASTGen.BridgedNullable {}
39-
extension BridgedNullableTypeRepr: /*@retroactive*/ swiftASTGen.BridgedNullable {}
40-
extension BridgedNullablePattern: /*@retroactive*/ swiftASTGen.BridgedNullable {}
41-
extension BridgedNullableGenericParamList: /*@retroactive*/ swiftASTGen.BridgedNullable {}
42-
extension BridgedNullableTrailingWhereClause: /*@retroactive*/ swiftASTGen.BridgedNullable {}
43-
extension BridgedNullableParameterList: /*@retroactive*/ swiftASTGen.BridgedNullable {}
44-
extension BridgedNullablePatternBindingInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable {}
45-
extension BridgedNullableDefaultArgumentInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable {}
46-
extension BridgedNullableCustomAttributeInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable {}
47-
extension BridgedNullableArgumentList: /*@retroactive*/ swiftASTGen.BridgedNullable {}
48-
extension BridgedNullableVarDecl: /*@retroactive*/ swiftASTGen.BridgedNullable {}
34+
extension SourceLoc: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
35+
extension Identifier: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
36+
extension BridgedNullableDecl: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
37+
extension BridgedNullableExpr: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
38+
extension BridgedNullableStmt: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
39+
extension BridgedNullableTypeRepr: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
40+
extension BridgedNullablePattern: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
41+
extension BridgedNullableGenericParamList: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
42+
extension BridgedNullableTrailingWhereClause: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
43+
extension BridgedNullableParameterList: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
44+
extension BridgedNullablePatternBindingInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
45+
extension BridgedNullableDefaultArgumentInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
46+
extension BridgedNullableCustomAttributeInitializer: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
47+
extension BridgedNullableArgumentList: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
48+
extension BridgedNullableVarDecl: /*@retroactive*/ swiftASTGen.BridgedNullable, Swift.ExpressibleByNilLiteral {}
4949

5050
extension Identifier: /*@retroactive*/ Swift.Equatable {
5151
public static func == (lhs: Self, rhs: Self) -> Bool {

stdlib/public/Concurrency/Actor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2774,7 +2774,8 @@ swift::swift_distributedActor_remote_initialize(const Metadata *actorType) {
27742774

27752775
// TODO: remove this memset eventually, today we only do this to not have
27762776
// to modify the destructor logic, as releasing zeroes is no-op
2777-
memset(alloc + 1, 0, metadata->getInstanceSize() - sizeof(HeapObject));
2777+
memset((void *)(alloc + 1), 0,
2778+
metadata->getInstanceSize() - sizeof(HeapObject));
27782779

27792780
// TODO(distributed): a remote one does not have to have the "real"
27802781
// default actor body, e.g. we don't need an executor at all; so

stdlib/public/core/StringBridge.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ extension String {
624624
_connectOrphanedFoundationSubclassesIfNeeded()
625625

626626
if _guts.isSmall {
627-
return unsafe _guts.asSmall.withUTF8 { bufPtr in
627+
return _guts.asSmall.withUTF8 { bufPtr in
628628
// Smol ASCII a) may bridge to tagged pointers, b) can't contain a BOM
629629
if _guts.isSmallASCII, let result = unsafe _createCFString(
630630
bufPtr.baseAddress._unsafelyUnwrappedUnchecked,

0 commit comments

Comments
 (0)