Merge pull request swiftlang#19434 from compnerd/a-stable-future

runtime: remove unnecessary preprocessor condition, flip cases (NFC)

Author: compnerd

include/swift/AST/KnownIdentifiers.def

@@ -100,11 +100,11 @@ IDENTIFIER(stringValue)
 IDENTIFIER(super)
 IDENTIFIER(superDecoder)
 IDENTIFIER(superEncoder)
-#if __APPLE__ && !SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
+#if SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
+IDENTIFIER_WITH_NAME(SwiftObject, "_TtCs12_SwiftObject")
+#else
 // Pre-stable ABI uses un-mangled name for SwiftObject.
 IDENTIFIER(SwiftObject)
-#else
-IDENTIFIER_WITH_NAME(SwiftObject, "_TtCs12_SwiftObject")
 #endif
 IDENTIFIER(to)
 IDENTIFIER(toRaw)

stdlib/public/runtime/SwiftObject.h

@@ -30,12 +30,12 @@
 
 #if SWIFT_OBJC_INTEROP
 
-#if __APPLE__ && !SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-// Pre-stable ABI uses un-mangled name for SwiftObject
-#else
+#if SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
 // Source code: "SwiftObject"
 // Real class name: mangled "Swift._SwiftObject"
 #define SwiftObject _TtCs12_SwiftObject
+#else
+// Pre-stable ABI uses un-mangled name for SwiftObject
 #endif
 
 #if __has_attribute(objc_root_class)

test/stdlib/Inputs/SwiftObjectNSObject/SwiftObjectNSObject.m

@@ -52,13 +52,13 @@
 
 // Add methods to class SwiftObject that can be called by performSelector: et al
 
-#if __APPLE__ && !SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-// Pre-stable ABI uses un-mangled name for SwiftObject.
-#define SwiftObjectDemangledName "SwiftObject"
-#else
+#if SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
 // mangled Swift._SwiftObject
 #define SwiftObject _TtCs12_SwiftObject
 #define SwiftObjectDemangledName "Swift._SwiftObject"
+#else
+// Pre-stable ABI uses un-mangled name for SwiftObject.
+#define SwiftObjectDemangledName "SwiftObject"
 #endif
 
 @interface SwiftObject /* trust me, I know what I'm doing */ @end