fix bad cherry-pick

Author: Lance Parker

benchmark/single-source/StringComparison.swift

@@ -30,8 +30,6 @@ extension String {
 }
 
 
-
-
 public let StringComparison: [BenchmarkInfo] = [
   BenchmarkInfo(
     name: "StringComparison_ascii",

benchmark/single-source/StringComparison.swift.gyb

@@ -37,6 +37,7 @@ AllWorkloads = ["ascii", "latin1", "fastPrenormal", "slowerPrenormal",
 ComparisonWorkloads = AllWorkloads
 HashingWorkloads = AllWorkloads[:-1]
 NormalizationWorkloads = AllWorkloads[:-1]
+}%
 
 public let StringComparison: [BenchmarkInfo] = [
 % for Name in ComparisonWorkloads:

test/api-digester/Outputs/stability-stdlib-abi.swift.expected

@@ -0,0 +1 @@
+

validation-test/stdlib/StringNormalization.swift

@@ -9,8 +9,15 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-// RUN: mkdir -p %t
-// RUN: %target-build-swift %s -o %t/a.out
+// RUN: %empty-directory(%t)
+// RUN: if [ %target-runtime == "objc" ]; \
+// RUN: then \
+// RUN:   %target-clang -fobjc-arc %S/Inputs/NSSlowString/NSSlowString.m -c -o %t/NSSlowString.o && \
+// RUN:   %target-build-swift -I %S/Inputs/NSSlowString/ %t/NSSlowString.o %s -o %t/a.out; \
+// RUN: else \
+// RUN:   %target-build-swift %s -o %t/a.out; \
+// RUN: fi
+// RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out %S/Inputs/NormalizationTest.txt
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
@@ -19,6 +26,10 @@ import Swift
 import StdlibUnittest
 import StdlibUnicodeUnittest
 
+#if _runtime(_ObjC)
+import NSSlowString
+#endif
+
 private func expectEqualIterators(
   label: String,
   expected: [UInt8],