Skip to content

Commit 94d0b18

Browse files
committed
---
yaml --- r: 245503 b: refs/heads/marcrasi-static-assert c: 2935c09 h: refs/heads/master i: 245501: 6093667 245499: 2609395 245495: 179e4db 245487: f151ab7 245471: 5dfdcdf 245439: 96db82c 245375: 1030196 245247: 5d17d4d
1 parent e66230b commit 94d0b18

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-20-a: 37a08a7edae5cf9ebde7866dbc974
10711071
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-21-a: a47bb052988de099ac2562a50cd1ee60a411e182
10721072
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-22-a: 141f61f3c887a81aa5d7a66e843f5e5e9a31ca02
10731073
refs/heads/anotherdayanothercommit: 983c399b25b26d80728c0bf11b12afac852768f6
1074-
refs/heads/marcrasi-static-assert: f52085a4404c202c284c80767130fd047c8bd8df
1074+
refs/heads/marcrasi-static-assert: 2935c09a07e7101951d05e4000588b1da048f0cd
10751075
refs/heads/revert-19500-updateValue-but-not-the-key: b4e27b110af0d7e3002b4f734a347f752d42b9a8
10761076
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-25-a: 2ed7952ddd7ef765b60efd13e169ea900ebb5e80
10771077
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-09-26-a: b7cbce34ef0921069091a65e5918640bb382a419

branches/marcrasi-static-assert/stdlib/public/core/VarArgs.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ internal let _countGPRegisters = 6
8080
// from 8 to 16 based on reading the spec, probably the bug you're looking for
8181
// is elsewhere.
8282
@usableFromInline
83-
internal let _countSSERegisters = 8
83+
internal let _countFPRegisters = 8
8484
@usableFromInline
85-
internal let _sseRegisterWords = 2
85+
internal let _fpRegisterWords = 2
8686
@usableFromInline
87-
internal let _registerSaveWords = _countGPRegisters + _countSSERegisters * _sseRegisterWords
87+
internal let _registerSaveWords = _countGPRegisters + _countFPRegisters * _fpRegisterWords
8888
#elseif arch(s390x)
8989
@usableFromInline
9090
internal let _countGPRegisters = 16
@@ -424,14 +424,14 @@ final internal class _VaListBuilder {
424424
#if arch(x86_64)
425425
let isDouble = arg is _CVarArgPassedAsDouble
426426

427-
if isDouble && sseRegistersUsed < _countSSERegisters {
427+
if isDouble && fpRegistersUsed < _countFPRegisters {
428428
var startIndex = _countGPRegisters
429-
+ (sseRegistersUsed * _sseRegisterWords)
429+
+ (fpRegistersUsed * _fpRegisterWords)
430430
for w in encoded {
431431
storage[startIndex] = w
432432
startIndex += 1
433433
}
434-
sseRegistersUsed += 1
434+
fpRegistersUsed += 1
435435
}
436436
else if encoded.count == 1
437437
&& !isDouble
@@ -472,7 +472,7 @@ final internal class _VaListBuilder {
472472
@usableFromInline // FIXME(sil-serialize-all)
473473
internal var gpRegistersUsed = 0
474474
@usableFromInline // FIXME(sil-serialize-all)
475-
internal var sseRegistersUsed = 0
475+
internal var fpRegistersUsed = 0
476476

477477
@usableFromInline // FIXME(sil-serialize-all)
478478
final // Property must be final since it is used by Builtin.addressof.

branches/marcrasi-static-assert/test/api-digester/Inputs/stdlib-stable-abi.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -242778,8 +242778,8 @@
242778242778
},
242779242779
{
242780242780
"kind": "Var",
242781-
"name": "_countSSERegisters",
242782-
"printedName": "_countSSERegisters",
242781+
"name": "_countFPRegisters",
242782+
"printedName": "_countFPRegisters",
242783242783
"children": [
242784242784
{
242785242785
"kind": "TypeNominal",
@@ -242800,13 +242800,13 @@
242800242800
}
242801242801
],
242802242802
"declKind": "Accessor",
242803-
"usr": "s:s18_countSSERegistersSivg",
242803+
"usr": "s:s17_countFPRegistersSivg",
242804242804
"moduleName": "Swift",
242805242805
"implicit": true
242806242806
}
242807242807
],
242808242808
"declKind": "Var",
242809-
"usr": "s:s18_countSSERegistersSivp",
242809+
"usr": "s:s17_countFPRegistersSivp",
242810242810
"moduleName": "Swift",
242811242811
"declAttributes": [
242812242812
"HasInitialValue",
@@ -242817,8 +242817,8 @@
242817242817
},
242818242818
{
242819242819
"kind": "Var",
242820-
"name": "_sseRegisterWords",
242821-
"printedName": "_sseRegisterWords",
242820+
"name": "_fpRegisterWords",
242821+
"printedName": "_fpRegisterWords",
242822242822
"children": [
242823242823
{
242824242824
"kind": "TypeNominal",
@@ -242839,13 +242839,13 @@
242839242839
}
242840242840
],
242841242841
"declKind": "Accessor",
242842-
"usr": "s:s17_sseRegisterWordsSivg",
242842+
"usr": "s:s16_fpRegisterWordsSivg",
242843242843
"moduleName": "Swift",
242844242844
"implicit": true
242845242845
}
242846242846
],
242847242847
"declKind": "Var",
242848-
"usr": "s:s17_sseRegisterWordsSivp",
242848+
"usr": "s:s16_fpRegisterWordsSivp",
242849242849
"moduleName": "Swift",
242850242850
"declAttributes": [
242851242851
"HasInitialValue",
@@ -243445,8 +243445,8 @@
243445243445
},
243446243446
{
243447243447
"kind": "Var",
243448-
"name": "sseRegistersUsed",
243449-
"printedName": "sseRegistersUsed",
243448+
"name": "fpRegistersUsed",
243449+
"printedName": "fpRegistersUsed",
243450243450
"children": [
243451243451
{
243452243452
"kind": "TypeNominal",
@@ -243467,7 +243467,7 @@
243467243467
}
243468243468
],
243469243469
"declKind": "Accessor",
243470-
"usr": "s:s14_VaListBuilderC16sseRegistersUsedSivg",
243470+
"usr": "s:s14_VaListBuilderC16fpRegistersUsedSivg",
243471243471
"moduleName": "Swift",
243472243472
"implicit": true,
243473243473
"declAttributes": [
@@ -243477,7 +243477,7 @@
243477243477
}
243478243478
],
243479243479
"declKind": "Var",
243480-
"usr": "s:s14_VaListBuilderC16sseRegistersUsedSivp",
243480+
"usr": "s:s14_VaListBuilderC15fpRegistersUsedSivp",
243481243481
"moduleName": "Swift",
243482243482
"declAttributes": [
243483243483
"Final",
@@ -244158,4 +244158,4 @@
244158244158
"isInternal": true
244159244159
}
244160244160
]
244161-
}
244161+
}

0 commit comments

Comments
 (0)