Move assume nullability to CFBase and remove the ForSwiftFoundationOnly definition of nullability assume macros since new CF ones are defined

Author: phausler

CoreFoundation/Base.subproj/CFBase.h

@@ -231,6 +231,15 @@ CF_EXTERN_C_BEGIN
 #define CF_AUTOMATED_REFCOUNT_UNAVAILABLE
 #endif
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+#ifndef CF_ASSUME_NONNULL_BEGIN
+#define CF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
+#endif
+#ifndef CF_ASSUME_NONNULL_BEGIN
+#define CF_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
+#endif
+#endif
+
 #ifndef CF_IMPLICIT_BRIDGING_ENABLED
 #if __has_feature(arc_cf_code_audited)
 #define CF_IMPLICIT_BRIDGING_ENABLED _Pragma("clang arc_cf_code_audited begin")

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -11,17 +11,14 @@
 #ifndef __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__
 #define __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ 1
 
-#define NS_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
-#define NS_ASSUME_NONNULL_END   _Pragma("clang assume_nonnull end")
-
 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFNumber.h>
 #include <CoreFoundation/CFLocaleInternal.h>
 #include <CoreFoundation/CFCalendar.h>
 
 #import <fts.h>
 
-NS_ASSUME_NONNULL_BEGIN
+CF_ASSUME_NONNULL_BEGIN
 
 struct __CFSwiftObject {
     uintptr_t isa;
@@ -211,6 +208,6 @@ extern void _cf_uuid_unparse(const _cf_uuid_t uu, _cf_uuid_string_t out);
 extern void _cf_uuid_unparse_lower(const _cf_uuid_t uu, _cf_uuid_string_t out);
 extern void _cf_uuid_unparse_upper(const _cf_uuid_t uu, _cf_uuid_string_t out);
 
-NS_ASSUME_NONNULL_END
+CF_ASSUME_NONNULL_END
 
 #endif /* __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ */