Merge pull request #4339 from jckarter/nsmutabledictionary-overlay-subscript-3.0

[3.0] Foundation overlay: Fix optionality mismatch in NSMutableDictionary subscript.

Author: tkremenek

stdlib/public/SDK/Foundation/Foundation.swift

@@ -1007,7 +1007,12 @@ extension NSMutableDictionary {
     set {
       // FIXME: Unfortunate that the `NSCopying` check has to be done at
       // runtime.
-      self.setObject(newValue, forKey: key as AnyObject as! NSCopying)
+      let copyingKey = key as AnyObject as! NSCopying
+      if let newValue = newValue {
+        self.setObject(newValue, forKey: copyingKey)
+      } else {
+        self.removeObject(forKey: copyingKey)
+      }
     }
   }
 }

test/1_stdlib/NSDictionary.swift

@@ -17,5 +17,13 @@ tests.test("copy construction") {
   let y = NSMutableDictionary(dictionary: expected as NSDictionary)
   expectEqual(expected, y as NSDictionary as! Dictionary)
 }
+// rdar://problem/27875914
+tests.test("subscript with Any") {
+  let d = NSMutableDictionary()
+  d["k"] = "@this is how the world ends"
+  expectEqual((d["k"]! as AnyObject).characterAtIndex(0), 0x40)
+  d["k"] = nil
+  expectTrue(d["k"] == nil)
+}
 
 runAllTests()