Merge pull request #17253 from millenomi/bundle-spi-darwin

millenomi · web-flow · commit f05c2cec9533 · 2018-06-15T17:02:28.000-07:00
Expose swift_getTypeContextDescriptor() on Darwin.
diff --git a/include/swift/Runtime/Metadata.h b/include/swift/Runtime/Metadata.h
@@ -721,13 +721,9 @@ void swift_getFieldAt(
 void verifyMangledNameRoundtrip(const Metadata *metadata);
 #endif
 
-#if !SWIFT_OBJC_INTEROP
-
 SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_API
 const TypeContextDescriptor *swift_getTypeContextDescriptor(const Metadata *type);
 
-#endif // !SWIFT_OBJC_INTEROP
-
 } // end namespace swift
 
 #endif // SWIFT_RUNTIME_METADATA_H
diff --git a/stdlib/public/runtime/Metadata.cpp b/stdlib/public/runtime/Metadata.cpp
@@ -3941,10 +3941,6 @@ void swift::verifyMangledNameRoundtrip(const Metadata *metadata) {
 }
 #endif
 
-#if !SWIFT_OBJC_INTEROP
-
 const TypeContextDescriptor *swift::swift_getTypeContextDescriptor(const Metadata *type) {
     return type->getTypeContextDescriptor();
 }
-
-#endif // !SWIFT_OBJC_INTEROP

Original file line number	Diff line number	Diff line change
`@@ -3941,10 +3941,6 @@ void swift::verifyMangledNameRoundtrip(const Metadata *metadata) {`
`3941`	`3941`	`}`
`3942`	`3942`	`#endif`
`3943`	`3943`
`3944`		`-#if !SWIFT_OBJC_INTEROP`
`3945`		`-`
`3946`	`3944`	`const TypeContextDescriptor swift::swift_getTypeContextDescriptor(const Metadata type) {`
`3947`	`3945`	`return type->getTypeContextDescriptor();`
`3948`	`3946`	`}`
`3949`		`-`
`3950`		`-#endif // !SWIFT_OBJC_INTEROP`