Skip to content

Commit 3086e74

Browse files
committed
---
yaml --- r: 345588 b: refs/heads/master c: 7d7d95a h: refs/heads/master
1 parent 582e45e commit 3086e74

File tree

5 files changed

+122
-93
lines changed

5 files changed

+122
-93
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: 18039734dc648c2e7740750698bf55ad56fbd93f
2+
refs/heads/master: 7d7d95a857efc69ffaf653b5da19f5ba87b7979c
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/Demangling/Demangler.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ static bool isFunctionAttr(Node::Kind kind) {
9797
switch (kind) {
9898
case Node::Kind::FunctionSignatureSpecialization:
9999
case Node::Kind::GenericSpecialization:
100+
case Node::Kind::InlinedGenericFunction:
100101
case Node::Kind::GenericSpecializationNotReAbstracted:
101102
case Node::Kind::GenericPartialSpecialization:
102103
case Node::Kind::GenericPartialSpecializationNotReAbstracted:
@@ -1289,6 +1290,8 @@ NodePointer Demangler::demangleBoundGenericArgs(NodePointer Nominal,
12891290
}
12901291

12911292
// Generic arguments for the outermost type come first.
1293+
if (Nominal->getNumChildren() == 0)
1294+
return nullptr;
12921295
NodePointer Context = Nominal->getFirstChild();
12931296

12941297
bool consumesGenericArgs = true;

trunk/stdlib/public/core/FloatingPoint.swift

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,7 @@ public enum FloatingPointSign: Int {
12321232
}
12331233
}
12341234

1235+
@_transparent
12351236
@inlinable
12361237
public static func ==(a: FloatingPointSign, b: FloatingPointSign) -> Bool {
12371238
return a.rawValue == b.rawValue
@@ -1721,9 +1722,11 @@ extension FloatingPoint {
17211722
/// - If `x` is `leastNonzeroMagnitude`, then `x.nextDown` is `0.0`.
17221723
/// - If `x` is zero, then `x.nextDown` is `-leastNonzeroMagnitude`.
17231724
/// - If `x` is `-greatestFiniteMagnitude`, then `x.nextDown` is `-infinity`.
1724-
@_transparent
17251725
public var nextDown: Self {
1726-
return -(-self).nextUp
1726+
@inline(__always)
1727+
get {
1728+
return -(-self).nextUp
1729+
}
17271730
}
17281731

17291732
/// Returns the remainder of this value divided by the given value using
@@ -1757,7 +1760,7 @@ extension FloatingPoint {
17571760
/// - Parameter other: The value to use when dividing this value.
17581761
/// - Returns: The remainder of this value divided by `other` using
17591762
/// truncating division.
1760-
@_transparent
1763+
@inline(__always)
17611764
public func truncatingRemainder(dividingBy other: Self) -> Self {
17621765
var lhs = self
17631766
lhs.formTruncatingRemainder(dividingBy: other)
@@ -1796,7 +1799,7 @@ extension FloatingPoint {
17961799
///
17971800
/// - Parameter other: The value to use when dividing this value.
17981801
/// - Returns: The remainder of this value divided by `other`.
1799-
@_transparent
1802+
@inline(__always)
18001803
public func remainder(dividingBy other: Self) -> Self {
18011804
var lhs = self
18021805
lhs.formRemainder(dividingBy: other)
@@ -1871,7 +1874,7 @@ extension FloatingPoint {
18711874
/// - y: Another floating-point value.
18721875
/// - Returns: The minimum of `x` and `y`, or whichever is a number if the
18731876
/// other is NaN.
1874-
@inlinable // FIXME(sil-serialize-all)
1877+
@inlinable
18751878
public static func minimum(_ x: Self, _ y: Self) -> Self {
18761879
if x.isSignalingNaN || y.isSignalingNaN {
18771880
// Produce a quiet NaN matching platform arithmetic behavior.
@@ -1908,7 +1911,7 @@ extension FloatingPoint {
19081911
/// - y: Another floating-point value.
19091912
/// - Returns: The greater of `x` and `y`, or whichever is a number if the
19101913
/// other is NaN.
1911-
@inlinable // FIXME(sil-serialize-all)
1914+
@inlinable
19121915
public static func maximum(_ x: Self, _ y: Self) -> Self {
19131916
if x.isSignalingNaN || y.isSignalingNaN {
19141917
// Produce a quiet NaN matching platform arithmetic behavior.
@@ -1947,7 +1950,7 @@ extension FloatingPoint {
19471950
/// - y: Another floating-point value.
19481951
/// - Returns: Whichever of `x` or `y` has lesser magnitude, or whichever is
19491952
/// a number if the other is NaN.
1950-
@inlinable // FIXME(sil-serialize-all)
1953+
@inlinable
19511954
public static func minimumMagnitude(_ x: Self, _ y: Self) -> Self {
19521955
if x.isSignalingNaN || y.isSignalingNaN {
19531956
// Produce a quiet NaN matching platform arithmetic behavior.
@@ -1986,7 +1989,7 @@ extension FloatingPoint {
19861989
/// - y: Another floating-point value.
19871990
/// - Returns: Whichever of `x` or `y` has greater magnitude, or whichever is
19881991
/// a number if the other is NaN.
1989-
@inlinable // FIXME(sil-serialize-all)
1992+
@inlinable
19901993
public static func maximumMagnitude(_ x: Self, _ y: Self) -> Self {
19911994
if x.isSignalingNaN || y.isSignalingNaN {
19921995
// Produce a quiet NaN matching platform arithmetic behavior.
@@ -2002,7 +2005,7 @@ extension FloatingPoint {
20022005
/// described by the [IEEE 754 specification][spec].
20032006
///
20042007
/// [spec]: http://ieeexplore.ieee.org/servlet/opac?punumber=4610933
2005-
@inlinable // FIXME(sil-serialize-all)
2008+
@inlinable
20062009
public var floatingPointClass: FloatingPointClassification {
20072010
if isSignalingNaN { return .signalingNaN }
20082011
if isNaN { return .quietNaN }
@@ -2043,14 +2046,14 @@ extension BinaryFloatingPoint {
20432046
/// initializer has the same sign as `signOf`.
20442047
/// - magnitudeOf: A value from which to use the magnitude. The result of
20452048
/// the initializer has the same magnitude as `magnitudeOf`.
2046-
@inlinable // FIXME(sil-serialize-all)
2049+
@inlinable
20472050
public init(signOf: Self, magnitudeOf: Self) {
20482051
self.init(sign: signOf.sign,
20492052
exponentBitPattern: magnitudeOf.exponentBitPattern,
20502053
significandBitPattern: magnitudeOf.significandBitPattern)
20512054
}
20522055

2053-
@inlinable // FIXME(sil-serialize-all)
2056+
@inlinable
20542057
public // @testable
20552058
static func _convert<Source : BinaryFloatingPoint>(
20562059
from source: Source
@@ -2192,7 +2195,7 @@ extension BinaryFloatingPoint {
21922195
/// with more trailing zeros in its significand bit pattern.
21932196
///
21942197
/// - Parameter value: A floating-point value to be converted.
2195-
@inlinable // FIXME(sil-serialize-all)
2198+
@inlinable
21962199
public init<Source : BinaryFloatingPoint>(_ value: Source) {
21972200
self = Self._convert(from: value).value
21982201
}
@@ -2204,7 +2207,7 @@ extension BinaryFloatingPoint {
22042207
/// result is `nil`.
22052208
///
22062209
/// - Parameter value: A floating-point value to be converted.
2207-
@inlinable // FIXME(sil-serialize-all)
2210+
@inlinable
22082211
public init?<Source : BinaryFloatingPoint>(exactly value: Source) {
22092212
let (value_, exact) = Self._convert(from: value)
22102213
guard exact else { return nil }
@@ -2233,7 +2236,7 @@ extension BinaryFloatingPoint {
22332236
/// - Parameter other: A floating-point value to compare to this value.
22342237
/// - Returns: `true` if this value is ordered below or the same as `other`
22352238
/// in a total ordering of the floating-point type; otherwise, `false`.
2236-
@inlinable // FIXME(sil-serialize-all)
2239+
@inlinable
22372240
public func isTotallyOrdered(belowOrEqualTo other: Self) -> Bool {
22382241
// Quick return when possible.
22392242
if self < other { return true }
@@ -2324,7 +2327,7 @@ extension BinaryFloatingPoint where Self.RawSignificand : FixedWidthInteger {
23242327
/// with more trailing zeros in its significand bit pattern.
23252328
///
23262329
/// - Parameter value: The integer to convert to a floating-point value.
2327-
@inlinable // FIXME(sil-serialize-all)
2330+
@inlinable
23282331
public init<Source : BinaryInteger>(_ value: Source) {
23292332
self = Self._convert(from: value).value
23302333
}
@@ -2334,7 +2337,7 @@ extension BinaryFloatingPoint where Self.RawSignificand : FixedWidthInteger {
23342337
/// If the given integer cannot be represented exactly, the result is `nil`.
23352338
///
23362339
/// - Parameter value: The integer to convert to a floating-point value.
2337-
@inlinable // FIXME(sil-serialize-all)
2340+
@inlinable
23382341
public init?<Source : BinaryInteger>(exactly value: Source) {
23392342
let (value_, exact) = Self._convert(from: value)
23402343
guard exact else { return nil }

0 commit comments

Comments
 (0)