Skip to content

Commit 04fafd7

Browse files
authored
Merge pull request #29881 from swiftwasm/swiftwasm-string
2 parents bb20a87 + 8e705f3 commit 04fafd7

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

stdlib/public/core/SmallString.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ internal struct _SmallString {
7676
extension _SmallString {
7777
@inlinable @inline(__always)
7878
internal static var capacity: Int {
79-
#if arch(i386) || arch(arm)
79+
#if arch(i386) || arch(arm) || arch(wasm32)
8080
return 10
8181
#else
8282
return 15
@@ -264,7 +264,7 @@ extension _SmallString {
264264

265265
self.init(leading: leading, trailing: trailing, count: count)
266266
}
267-
267+
268268
@inline(__always)
269269
internal init(
270270
initializingUTF8With initializer: (

stdlib/public/core/StringObject.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ internal struct _StringObject {
7777
internal init(zero: ()) { self._storage = 0 }
7878
}
7979

80-
#if arch(i386) || arch(arm)
80+
#if arch(i386) || arch(arm) || arch(wasm32)
8181
@usableFromInline @frozen
8282
internal enum Variant {
8383
case immortal(UInt)
@@ -512,7 +512,7 @@ extension _StringObject {
512512
// spare bits (the most significant nibble) in a pointer.
513513
let word1 = small.rawBits.0.littleEndian
514514
let word2 = small.rawBits.1.littleEndian
515-
#if arch(i386) || arch(arm)
515+
#if arch(i386) || arch(arm) || arch(wasm32)
516516
// On 32-bit, we need to unpack the small string.
517517
let smallStringDiscriminatorAndCount: UInt64 = 0xFF00_0000_0000_0000
518518

@@ -819,7 +819,7 @@ extension _StringObject {
819819

820820
@inline(__always)
821821
internal var nativeStorage: __StringStorage {
822-
#if arch(i386) || arch(arm)
822+
#if arch(i386) || arch(arm) || arch(wasm32)
823823
guard case .native(let storage) = _variant else {
824824
_internalInvariantFailure()
825825
}
@@ -987,7 +987,7 @@ extension _StringObject {
987987
) {
988988
let countAndFlags = CountAndFlags(sharedCount: length, isASCII: isASCII)
989989
let discriminator = Nibbles.largeCocoa(providesFastUTF8: providesFastUTF8)
990-
#if arch(i386) || arch(arm)
990+
#if arch(i386) || arch(arm) || arch(wasm32)
991991
self.init(
992992
variant: .bridged(cocoa),
993993
discriminator: discriminator,

stdlib/public/core/StringStorage.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ extension __StringStorage {
186186
let count = try initializer(buffer)
187187

188188
let countAndFlags = CountAndFlags(mortalCount: count, isASCII: false)
189-
#if arch(i386) || arch(arm)
189+
#if arch(i386) || arch(arm) || arch(wasm32)
190190
storage._count = countAndFlags.count
191191
storage._flags = countAndFlags.flags
192192
#else

0 commit comments

Comments
 (0)