Merge pull request #4307 from jckarter/swiftvalue-swifttypename-method

Runtime: Add a convenient `-[_SwiftValue _swiftTypeName]` method for debugging.

Author: jckarter

include/swift/Runtime/HeapObject.h

@@ -1155,6 +1155,11 @@ static inline void swift_unknownUnownedTakeAssign(UnownedReference *dest,
 
 #endif /* SWIFT_OBJC_INTEROP */
 
+/// Return the name of a Swift type represented by a metadata object.
+SWIFT_CC(swift) SWIFT_RUNTIME_EXPORT
+extern "C"
+TwoWordPair<const char *, uintptr_t>::Return
+swift_getTypeName(const Metadata *type, bool qualified);  
 
 } // end namespace swift
 

stdlib/public/runtime/Casting.cpp

@@ -316,9 +316,8 @@ std::string swift::nameForMetadata(const Metadata *type,
 }
 
 SWIFT_CC(swift) SWIFT_RUNTIME_EXPORT
-extern "C"
 TwoWordPair<const char *, uintptr_t>::Return
-swift_getTypeName(const Metadata *type, bool qualified) {
+swift::swift_getTypeName(const Metadata *type, bool qualified) {
   using Pair = TwoWordPair<const char *, uintptr_t>;
   using Key = llvm::PointerIntPair<const Metadata *, 1, bool>;
 

stdlib/public/runtime/SwiftValue.mm

@@ -326,6 +326,12 @@ - (NSString *)debugDescription {
 - (const Metadata *)_swiftTypeMetadata {
   return getSwiftValueTypeMetadata(self);
 }
+- (NSString *)_swiftTypeName {
+  TwoWordPair<const char *, uintptr_t> typeName
+    = swift_getTypeName(getSwiftValueTypeMetadata(self), true);
+  
+  return [NSString stringWithUTF8String: typeName.first];
+}
 - (const OpaqueValue *)_swiftValue {
   return getValueFromSwiftValue(self).second;
 }