Skip to content

Commit b9a683f

Browse files
committed
---
yaml --- r: 345823 b: refs/heads/master c: d021653 h: refs/heads/master i: 345821: 8011d63 345819: feb3db1 345815: 2cb8614 345807: c311b29 345791: 864bfb9
1 parent 14abac4 commit b9a683f

File tree

6 files changed

+8
-19
lines changed

6 files changed

+8
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 2af3959253dafe2030451be22017d21c2871b8a7
2+
refs/heads/master: d021653cf07eb7be83a73c672d30a0cba56e85b0
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Parse/ParseDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
14911491
diagnose(ForLoc, diag::attr_dynamic_replacement_expected_colon);
14921492
return false;
14931493
}
1494-
auto ColonLoc = consumeToken(tok::colon);
1494+
consumeToken(tok::colon);
14951495
{
14961496
SyntaxParsingContext ContentContext(SyntaxContext,
14971497
SyntaxKind::DeclName);

trunk/stdlib/public/core/Integers.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,8 +1430,6 @@ extension BinaryInteger {
14301430
//===----------------------------------------------------------------------===//
14311431

14321432
extension BinaryInteger {
1433-
@usableFromInline
1434-
@_transparent
14351433
internal func _description(radix: Int, uppercase: Bool) -> String {
14361434
_precondition(2...36 ~= radix, "Radix must be between 2 and 36")
14371435

trunk/stdlib/public/core/Runtime.swift.gyb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,12 @@ internal func _swift_stdlib_atomicFetchAddInt(
170170
//===----------------------------------------------------------------------===//
171171

172172
/// A 32 byte buffer.
173-
@_fixed_layout // FIXME(sil-serialize-all)
174-
@usableFromInline // FIXME(sil-serialize-all)
175173
internal struct _Buffer32 {
176-
@inlinable // FIXME(sil-serialize-all)
177174
internal init() {}
178175
% for i in range(32):
179-
@usableFromInline // FIXME(sil-serialize-all)
180176
internal var _x${i}: UInt8 = 0
181177
% end
182178

183-
@inlinable // FIXME(sil-serialize-all)
184179
internal mutating func withBytes<Result>(
185180
_ body: (UnsafeMutablePointer<UInt8>) throws -> Result
186181
) rethrows -> Result
@@ -192,17 +187,12 @@ internal struct _Buffer32 {
192187
}
193188

194189
/// A 72 byte buffer.
195-
@_fixed_layout // FIXME(sil-serialize-all)
196-
@usableFromInline // FIXME(sil-serialize-all)
197190
internal struct _Buffer72 {
198-
@inlinable // FIXME(sil-serialize-all)
199191
internal init() {}
200192
% for i in range(72):
201-
@usableFromInline // FIXME(sil-serialize-all)
202193
internal var _x${i}: UInt8 = 0
203194
% end
204195

205-
@inlinable // FIXME(sil-serialize-all)
206196
internal mutating func withBytes<Result>(
207197
_ body: (UnsafeMutablePointer<UInt8>) throws -> Result
208198
) rethrows -> Result
@@ -243,15 +233,13 @@ internal func _float${bits}ToString(
243233

244234
% end
245235

246-
@usableFromInline // FIXME(sil-serialize-all)
247236
@_silgen_name("swift_int64ToString")
248237
internal func _int64ToStringImpl(
249238
_ buffer: UnsafeMutablePointer<UTF8.CodeUnit>,
250239
_ bufferLength: UInt, _ value: Int64,
251240
_ radix: Int64, _ uppercase: Bool
252241
) -> UInt
253242

254-
@inlinable // FIXME(sil-serialize-all)
255243
internal func _int64ToString(
256244
_ value: Int64, radix: Int64 = 10, uppercase: Bool = false
257245
) -> String {
@@ -274,14 +262,12 @@ internal func _int64ToString(
274262
}
275263
}
276264

277-
@usableFromInline // FIXME(sil-serialize-all)
278265
@_silgen_name("swift_uint64ToString")
279266
internal func _uint64ToStringImpl(
280267
_ buffer: UnsafeMutablePointer<UTF8.CodeUnit>,
281268
_ bufferLength: UInt, _ value: UInt64, _ radix: Int64, _ uppercase: Bool
282269
) -> UInt
283270

284-
@inlinable // FIXME(sil-serialize-all)
285271
public // @testable
286272
func _uint64ToString(
287273
_ value: UInt64, radix: Int64 = 10, uppercase: Bool = false

trunk/stdlib/public/core/StringLegacy.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ extension String {
181181
/// - uppercase: Pass `true` to use uppercase letters to represent numerals
182182
/// greater than 9, or `false` to use lowercase letters. The default is
183183
/// `false`.
184-
@inlinable // FIXME(sil-serialize-all)
185184
public init<T : BinaryInteger>(
186185
_ value: T, radix: Int = 10, uppercase: Bool = false
187186
) {

trunk/test/api-digester/Outputs/stability-stdlib-abi.swift.expected

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ Func MutableCollection._partition(within:by:) has generic signature change from
66

77
/* Removed Decls */
88
Class _stdlib_AtomicInt has been removed
9+
Func BinaryInteger._description(radix:uppercase:) has been removed
910
Func MutableCollection._heapSort(within:by:) has been removed
1011
Func MutableCollection._heapify(within:by:) has been removed
1112
Func MutableCollection._introSort(within:by:) has been removed
1213
Func MutableCollection._introSortImpl(within:by:depthLimit:) has been removed
1314
Func MutableCollection._siftDown(_:within:by:) has been removed
1415
Func MutableCollection._sort3(_:_:_:by:) has been removed
16+
Func _int64ToString(_:radix:uppercase:) has been removed
17+
Func _int64ToStringImpl(_:_:_:_:_:) has been removed
1518
Func _stdlib_atomicCompareExchangeStrongInt(object:expected:desired:) has been removed
1619
Func _stdlib_atomicCompareExchangeStrongInt32(object:expected:desired:) has been removed
1720
Func _stdlib_atomicCompareExchangeStrongInt64(object:expected:desired:) has been removed
@@ -45,7 +48,10 @@ Func _swift_stdlib_atomicStoreInt32(object:desired:) has been removed
4548
Func _swift_stdlib_atomicStoreInt64(object:desired:) has been removed
4649
Func _swift_stdlib_atomicStoreUInt32(object:desired:) has been removed
4750
Func _swift_stdlib_atomicStoreUInt64(object:desired:) has been removed
51+
Func _uint64ToStringImpl(_:_:_:_:_:) has been removed
4852
Protocol _HasherCore has been removed
53+
Struct _Buffer32 has been removed
54+
Struct _Buffer72 has been removed
4955
Struct _BufferingHasher has been removed
5056
Struct _HasherTailBuffer has been removed
5157

0 commit comments

Comments
 (0)