Merge pull request swiftlang#21302 from DougGregor/runtime-unique-witness-tables

Author: swift-ci

stdlib/public/runtime/Metadata.cpp

@@ -3669,7 +3669,8 @@ namespace {
     int compareWithKey(const Key other) const {
       if (auto r = comparePointers(other.protocol, key.protocol))
         return r;
-      return strcmp(other.type->Name.get(), key.type->Name.get());
+
+      return TypeContextIdentity(other.type).compare(TypeContextIdentity(key.type));
     }
 
     static size_t getExtraAllocationSize(const Key,

test/Runtime/conformance_uniquing.swift

@@ -0,0 +1,20 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+// REQUIRES: objc_interop
+
+import StdlibUnittest
+import Foundation
+
+let conformanceUniquingTests = TestSuite("ConformanceUniquing")
+
+func isSimpleSetAlgebra<T: SetAlgebra>(_: T.Type) -> Bool {
+  return T.self == T.Element.self
+}
+
+// rdar://problem/46685973
+conformanceUniquingTests.test("Nested types with the same name") {
+  expectTrue(isSimpleSetAlgebra(NSData.WritingOptions.self))
+  expectTrue(isSimpleSetAlgebra(JSONSerialization.WritingOptions.self))
+}
+
+runAllTests()