Set build-swift-stdlib-unicode-data=0 for the freestanding preset (#41258)

kubamracek · web-flow · commit 15400c3ef799 · 2022-02-08T12:31:49.000-08:00
diff --git a/stdlib/public/stubs/Unicode/UnicodeGrapheme.cpp b/stdlib/public/stubs/Unicode/UnicodeGrapheme.cpp
@@ -69,6 +69,9 @@ __swift_uint8_t _swift_stdlib_getGraphemeBreakProperty(__swift_uint32_t scalar)
 
 SWIFT_RUNTIME_STDLIB_INTERNAL
 __swift_bool _swift_stdlib_isLinkingConsonant(__swift_uint32_t scalar) {
+#if !SWIFT_STDLIB_ENABLE_UNICODE_DATA
+  swift::swift_abortDisabledUnicodeSupport();
+#else
   auto idx = _swift_stdlib_getScalarBitArrayIdx(scalar,
                                           _swift_stdlib_linkingConsonant,
                                           _swift_stdlib_linkingConsonant_ranks);
@@ -78,4 +81,5 @@ __swift_bool _swift_stdlib_isLinkingConsonant(__swift_uint32_t scalar) {
   }
 
   return true;
+#endif
 }
diff --git a/test/stdlib/Character.swift b/test/stdlib/Character.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-stdlib-swift
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 import Swift
diff --git a/test/stdlib/CharacterProperties.swift b/test/stdlib/CharacterProperties.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 
diff --git a/test/stdlib/RawRepresentable-tricky-hashing.swift b/test/stdlib/RawRepresentable-tricky-hashing.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 
diff --git a/test/stdlib/StringDeconstruction.swift b/test/stdlib/StringDeconstruction.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 defer { runAllTests() }
diff --git a/test/stdlib/StringIndex.swift b/test/stdlib/StringIndex.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 
diff --git a/test/stdlib/ThreadLocalStorage.swift b/test/stdlib/ThreadLocalStorage.swift
@@ -1,6 +1,7 @@
 // RUN: %target-run-stdlib-swift
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 import Swift
diff --git a/test/stdlib/UnicodeScalarPropertiesTests.swift b/test/stdlib/UnicodeScalarPropertiesTests.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift %t
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 
diff --git a/test/stdlib/subString.swift b/test/stdlib/subString.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
+// UNSUPPORTED: freestanding
 
 import StdlibUnittest
 
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -2536,6 +2536,7 @@ swift-stdlib-enable-vector-types=0
 swift-stdlib-experimental-hermetic-seal-at-link=1
 swift-stdlib-disable-instantiation-caches=1
 swift-stdlib-has-type-printing=0
+build-swift-stdlib-unicode-data=0
 
 [preset: stdlib_S_standalone_minimal_macho_x86_64,build]
 mixin-preset=

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ __swift_uint8_t _swift_stdlib_getGraphemeBreakProperty(__swift_uint32_t scalar)`
`69`	`69`
`70`	`70`	`SWIFT_RUNTIME_STDLIB_INTERNAL`
`71`	`71`	`__swift_bool _swift_stdlib_isLinkingConsonant(__swift_uint32_t scalar) {`
	`72`	`+#if !SWIFT_STDLIB_ENABLE_UNICODE_DATA`
	`73`	`+ swift::swift_abortDisabledUnicodeSupport();`
	`74`	`+#else`
`72`	`75`	`auto idx = _swift_stdlib_getScalarBitArrayIdx(scalar,`
`73`	`76`	`_swift_stdlib_linkingConsonant,`
`74`	`77`	`_swift_stdlib_linkingConsonant_ranks);`
`@@ -78,4 +81,5 @@ __swift_bool _swift_stdlib_isLinkingConsonant(__swift_uint32_t scalar) {`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`return true;`
	`84`	`+#endif`
`81`	`85`	`}`