Also fix and test uppercased and lowercased

Author: aschwaighofer

stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb

@@ -192,22 +192,6 @@ bool swift_stdlib_NSStringHasSuffixNFDPointer(void *theString,
   return Result;
 }
 
-SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
-NS_RETURNS_RETAINED NSString *
-swift_stdlib_NSStringLowercaseString(NSString *NS_RELEASES_ARGUMENT str) {
-  NSString *Result = objc_retain(str.lowercaseString);
-  swift_unknownRelease(str);
-  return Result;
-}
-
-SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
-NS_RETURNS_RETAINED NSString *
-swift_stdlib_NSStringUppercaseString(NSString *NS_RELEASES_ARGUMENT str) {
-  NSString *Result = objc_retain(str.uppercaseString);
-  swift_unknownRelease(str);
-  return Result;
-}
-
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
 void swift_stdlib_CFSetGetValues(NSSet *NS_RELEASES_ARGUMENT set,
                                             const void **values) {

stdlib/public/stubs/SwiftNativeNSXXXBaseARC.m

@@ -37,4 +37,17 @@ size_t swift_stdlib_NSStringHashValue(NSString *NS_RELEASES_ARGUMENT str,
       (__bridge NSString __unsafe_unretained *)opaque;
   return isASCII ? str.hash : str.decomposedStringWithCanonicalMapping.hash;
 }
+
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
+NS_RETURNS_RETAINED NSString *
+swift_stdlib_NSStringLowercaseString(NSString *NS_RELEASES_ARGUMENT str) {
+  return str.lowercaseString;
+}
+
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
+NS_RETURNS_RETAINED NSString *
+swift_stdlib_NSStringUppercaseString(NSString *NS_RELEASES_ARGUMENT str) {
+  return str.uppercaseString;
+}
+
 #endif

test/stdlib/StringMemoryTest.swift

@@ -8,6 +8,9 @@
 
 import Foundation
 
+let str = "abcdefg\u{A758}hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\u{A759}"
+let str2 = "abcdefg\u{A759}hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\u{A758}"
+
 @inline(never)
 func lookup(_ str: String, _ dict: [String: Int]) -> Bool {
   if let _ = dict[str] {
@@ -16,16 +19,34 @@ func lookup(_ str: String, _ dict: [String: Int]) -> Bool {
   return false
 }
 
+@inline(never)
+func uppercase(_ str: String) -> String {
+      return str.uppercased()
+}
+
+@inline(never)
+func lowercase(_ str: String) -> String {
+      return str.lowercased()
+}
+
 /// Make sure the hash function does not leak.
 
 let dict = [ "foo" : 1]
 for _ in 0 ..< 10_000_000 {
   if lookup("\u{1F1E7}\u{1F1E7}", dict) {
     print("Found?!")
   }
+  if uppercase(str) == "A" {
+    print("Found?!")
+  }
+  if lowercase(str2) == "A" {
+    print("Found?!")
+  }
 }
 
+// CHECK-NOT: Found?!
 // CHECK: Not found
+
 print("Not found")
 
 var usage = rusage()