Merge pull request #19877 from compnerd/sse-no-more

SSE no more

Author: compnerd

stdlib/public/core/VarArgs.swift

@@ -80,11 +80,11 @@ internal let _countGPRegisters = 6
 // from 8 to 16 based on reading the spec, probably the bug you're looking for
 // is elsewhere.
 @usableFromInline
-internal let _countSSERegisters = 8
+internal let _countFPRegisters = 8
 @usableFromInline
-internal let _sseRegisterWords = 2
+internal let _fpRegisterWords = 2
 @usableFromInline
-internal let _registerSaveWords = _countGPRegisters + _countSSERegisters * _sseRegisterWords
+internal let _registerSaveWords = _countGPRegisters + _countFPRegisters * _fpRegisterWords
 #elseif arch(s390x)
 @usableFromInline
 internal let _countGPRegisters = 16
@@ -422,18 +422,19 @@ final internal class _VaListBuilder {
     var encoded = arg._cVarArgEncoding
 
 #if arch(x86_64)
-    if arg is _CVarArgPassedAsDouble
-      && sseRegistersUsed < _countSSERegisters {
+    let isDouble = arg is _CVarArgPassedAsDouble
+
+    if isDouble && fpRegistersUsed < _countFPRegisters {
       var startIndex = _countGPRegisters
-           + (sseRegistersUsed * _sseRegisterWords)
+           + (fpRegistersUsed * _fpRegisterWords)
       for w in encoded {
         storage[startIndex] = w
         startIndex += 1
       }
-      sseRegistersUsed += 1
+      fpRegistersUsed += 1
     }
     else if encoded.count == 1
-      && !(arg is _CVarArgPassedAsDouble)
+      && !isDouble
       && gpRegistersUsed < _countGPRegisters {
       storage[gpRegistersUsed] = encoded[0]
       gpRegistersUsed += 1
@@ -471,7 +472,7 @@ final internal class _VaListBuilder {
   @usableFromInline // FIXME(sil-serialize-all)
   internal var gpRegistersUsed = 0
   @usableFromInline // FIXME(sil-serialize-all)
-  internal var sseRegistersUsed = 0
+  internal var fpRegistersUsed = 0
 
   @usableFromInline // FIXME(sil-serialize-all)
   final  // Property must be final since it is used by Builtin.addressof.

test/api-digester/Inputs/stdlib-stable-abi.json

@@ -242736,8 +242736,8 @@
     },
     {
       "kind": "Var",
-      "name": "_countSSERegisters",
-      "printedName": "_countSSERegisters",
+      "name": "_countFPRegisters",
+      "printedName": "_countFPRegisters",
       "children": [
         {
           "kind": "TypeNominal",
@@ -242758,13 +242758,13 @@
             }
           ],
           "declKind": "Accessor",
-          "usr": "s:s18_countSSERegistersSivg",
+          "usr": "s:s17_countFPRegistersSivg",
           "moduleName": "Swift",
           "implicit": true
         }
       ],
       "declKind": "Var",
-      "usr": "s:s18_countSSERegistersSivp",
+      "usr": "s:s17_countFPRegistersSivp",
       "moduleName": "Swift",
       "declAttributes": [
         "HasInitialValue",
@@ -242775,8 +242775,8 @@
     },
     {
       "kind": "Var",
-      "name": "_sseRegisterWords",
-      "printedName": "_sseRegisterWords",
+      "name": "_fpRegisterWords",
+      "printedName": "_fpRegisterWords",
       "children": [
         {
           "kind": "TypeNominal",
@@ -242797,13 +242797,13 @@
             }
           ],
           "declKind": "Accessor",
-          "usr": "s:s17_sseRegisterWordsSivg",
+          "usr": "s:s16_fpRegisterWordsSivg",
           "moduleName": "Swift",
           "implicit": true
         }
       ],
       "declKind": "Var",
-      "usr": "s:s17_sseRegisterWordsSivp",
+      "usr": "s:s16_fpRegisterWordsSivp",
       "moduleName": "Swift",
       "declAttributes": [
         "HasInitialValue",
@@ -243403,8 +243403,8 @@
         },
         {
           "kind": "Var",
-          "name": "sseRegistersUsed",
-          "printedName": "sseRegistersUsed",
+          "name": "fpRegistersUsed",
+          "printedName": "fpRegistersUsed",
           "children": [
             {
               "kind": "TypeNominal",
@@ -243425,7 +243425,7 @@
                 }
               ],
               "declKind": "Accessor",
-              "usr": "s:s14_VaListBuilderC16sseRegistersUsedSivg",
+              "usr": "s:s14_VaListBuilderC16fpRegistersUsedSivg",
               "moduleName": "Swift",
               "implicit": true,
               "declAttributes": [
@@ -243435,7 +243435,7 @@
             }
           ],
           "declKind": "Var",
-          "usr": "s:s14_VaListBuilderC16sseRegistersUsedSivp",
+          "usr": "s:s14_VaListBuilderC15fpRegistersUsedSivp",
           "moduleName": "Swift",
           "declAttributes": [
             "Final",
@@ -244116,4 +244116,4 @@
       "isInternal": true
     }
   ]
-}
+}