Skip to content

Commit 608edaf

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents 2f07d52 + 6c9edfe commit 608edaf

File tree

75 files changed

+100
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+100
-30
lines changed

stdlib/public/core/IntegerTypes.swift.gyb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -761,26 +761,6 @@ extension Int {
761761
}
762762
}
763763

764-
@_transparent
765-
@inlinable
766-
internal func _unsafePlus(_ lhs: Int, _ rhs: Int) -> Int {
767-
#if INTERNAL_CHECKS_ENABLED
768-
return lhs + rhs
769-
#else
770-
return lhs &+ rhs
771-
#endif
772-
}
773-
774-
@_transparent
775-
@inlinable
776-
internal func _unsafeMinus(_ lhs: Int, _ rhs: Int) -> Int {
777-
#if INTERNAL_CHECKS_ENABLED
778-
return lhs - rhs
779-
#else
780-
return lhs &- rhs
781-
#endif
782-
}
783-
784764
@_unavailableInEmbedded
785765
internal struct _IntegerAnyHashableBox<
786766
Base: FixedWidthInteger

stdlib/public/core/LegacyABI.swift

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
5+
// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
66
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
88
// See https://swift.org/LICENSE.txt for license information
@@ -87,3 +87,29 @@ extension String.UTF16View {
8787
@inlinable @inline(__always)
8888
internal var _shortHeuristic: Int { return 32 }
8989
}
90+
91+
@usableFromInline
92+
internal func unimplemented_utf8_32bit(
93+
_ message: String = "",
94+
file: StaticString = #file, line: UInt = #line
95+
) -> Never {
96+
fatalError("32-bit: Unimplemented for UTF-8 support", file: file, line: line)
97+
}
98+
99+
@usableFromInline
100+
internal func _unsafePlus(_ lhs: Int, _ rhs: Int) -> Int {
101+
#if INTERNAL_CHECKS_ENABLED
102+
return lhs + rhs
103+
#else
104+
return lhs &+ rhs
105+
#endif
106+
}
107+
108+
@usableFromInline
109+
internal func _unsafeMinus(_ lhs: Int, _ rhs: Int) -> Int {
110+
#if INTERNAL_CHECKS_ENABLED
111+
return lhs - rhs
112+
#else
113+
return lhs &- rhs
114+
#endif
115+
}

stdlib/public/core/String.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
5+
// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
66
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
88
// See https://swift.org/LICENSE.txt for license information
@@ -12,14 +12,6 @@
1212

1313
import SwiftShims
1414

15-
@inlinable @_transparent
16-
internal func unimplemented_utf8_32bit(
17-
_ message: String = "",
18-
file: StaticString = #file, line: UInt = #line
19-
) -> Never {
20-
fatalError("32-bit: Unimplemented for UTF-8 support", file: file, line: line)
21-
}
22-
2315
/// A Unicode string value that is a collection of characters.
2416
///
2517
/// A string is a series of characters, such as `"Swift"`, that forms a

test/Concurrency/Reflection/reflect_task.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// REQUIRES: concurrency
1010
// UNSUPPORTED: use_os_stdlib
1111
// UNSUPPORTED: back_deployment_runtime
12+
// UNSUPPORTED: asan
1213

1314
import Swift
1415
import _Concurrency

validation-test/Reflection/reflect_Array.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Bool.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Character.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Dictionary.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Double.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_254CaseNoPayloads.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_bulky.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_degenerate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic2.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic3.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic4.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic5.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic6.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic7.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic8.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_generic_empty.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_large.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_value.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_MultiPayload_value_indirect.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_NoCase.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_SingleCaseCFPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// REQUIRES: executable_test
99
// REQUIRES: objc_interop
1010
// UNSUPPORTED: use_os_stdlib
11+
// UNSUPPORTED: asan
1112

1213
import SwiftReflectionTest
1314
import Foundation

validation-test/Reflection/reflect_Enum_SingleCaseIntPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_SingleCaseNoPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_SingleCasePointerPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_SingleCaseVoidPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_SinglePayload_generic1.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_TwoCaseNoPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_TwoCaseOnePointerPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_TwoCaseOneStructPayload.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_TwoCaseTwoPayloads.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: reflection_test_support
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_value.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import Foundation
1213
import SwiftReflectionTest

validation-test/Reflection/reflect_Enum_values.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_values10.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_values11.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_values2.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

validation-test/Reflection/reflect_Enum_values3.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// REQUIRES: objc_interop
88
// REQUIRES: executable_test
99
// UNSUPPORTED: use_os_stdlib
10+
// UNSUPPORTED: asan
1011

1112
import SwiftReflectionTest
1213

0 commit comments

Comments
 (0)