Mark as API; use expanded-from-template return type.

Author: millenomi

include/swift/Runtime/Metadata.h

@@ -4379,9 +4379,8 @@ void verifyMangledNameRoundtrip(const Metadata *metadata);
 
 #if !SWIFT_OBJC_INTEROP
 
-SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_SPI // SPI for swift-corelibs-foundation
-ConstTargetMetadataPointer<swift::InProcess, TargetTypeContextDescriptor>
-_swift_getTypeContextDescriptor(const Metadata *type);
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
+const TypeContextDescriptor *swift_getTypeContextDescriptor(const Metadata *type);
 
 #endif // !SWIFT_OBJC_INTEROP
 

stdlib/public/runtime/Metadata.cpp

@@ -3943,9 +3943,7 @@ void swift::verifyMangledNameRoundtrip(const Metadata *metadata) {
 
 #if !SWIFT_OBJC_INTEROP
 
-// SPI for swift-corelibs-foundation
-ConstTargetMetadataPointer<swift::InProcess, TargetTypeContextDescriptor>
-swift::_swift_getTypeContextDescriptor(const Metadata *type) {
+const TypeContextDescriptor *swift::swift_getTypeContextDescriptor(const Metadata *type) {
     return type->getTypeContextDescriptor();
 }