Fix macOS issues with TypeNamePair.

troughton · troughton · commit 215592cf6427 · 2017-12-07T20:32:47.000+13:00
diff --git a/stdlib/public/SDK/Foundation/CheckClass.mm b/stdlib/public/SDK/Foundation/CheckClass.mm
@@ -59,7 +59,7 @@ static void logIfFirstOccurrence(Class objcClass, void (^log)(void)) {
     template <size_t N>
     StringRefLite(const char (&staticStr)[N]) : data(staticStr), length(N) {}
 
-    StringRefLite(TypeNamePair rawValue)
+    StringRefLite(swift::TypeNamePair rawValue)
         : data(rawValue.data),
           length(rawValue.length){}
 
diff --git a/stdlib/public/runtime/SwiftValue.mm b/stdlib/public/runtime/SwiftValue.mm
@@ -369,7 +369,7 @@ - (NSString *)_swiftTypeName {
   TypeNamePair typeName
     = swift_getTypeName(getSwiftValueTypeMetadata(self), true);
 
-  return [NSString stringWithUTF8String: typeName.first];
+  return [NSString stringWithUTF8String: typeName.data];
 }
 - (const OpaqueValue *)_swiftValue {
   return getValueFromSwiftValue(self).second;

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ - (NSString *)_swiftTypeName {`
`369`	`369`	`TypeNamePair typeName`
`370`	`370`	`= swift_getTypeName(getSwiftValueTypeMetadata(self), true);`
`371`	`371`
`372`		`- return [NSString stringWithUTF8String: typeName.first];`
	`372`	`+ return [NSString stringWithUTF8String: typeName.data];`
`373`	`373`	`}`
`374`	`374`	`- (const OpaqueValue *)_swiftValue {`
`375`	`375`	`return getValueFromSwiftValue(self).second;`