[RemoteMirrors] Switch #ifdef __APPLE__ to #if defined(__APPLE__) && defined(__MACH__) to be more specific about the fact that this code is for MachO.

Author: mikeash

include/swift/Reflection/ReflectionContext.h

@@ -18,7 +18,7 @@
 #ifndef SWIFT_REFLECTION_REFLECTIONCONTEXT_H
 #define SWIFT_REFLECTION_REFLECTIONCONTEXT_H
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #include <mach-o/getsect.h>
 #endif
 
@@ -35,15 +35,15 @@
 #include <vector>
 #include <unordered_map>
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #ifndef __LP64__
 typedef const struct mach_header MachHeader;
 #else
 typedef const struct mach_header_64 MachHeader;
 #endif
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 template <typename Section>
 static std::pair<Section, bool> findSection(MachHeader *Header,
                                             const char *Name) {
@@ -58,7 +58,7 @@ static std::pair<Section, bool> findSection(MachHeader *Header,
            reinterpret_cast<const void *>(End)},
           true};
 }
-#endif // __APPLE__
+#endif
 
 namespace swift {
 namespace reflection {
@@ -113,7 +113,7 @@ class ReflectionContext
     getBuilder().dumpAllSections();
   }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
   bool addImage(RemoteAddress ImageStart) {
     const void *Buf;
     std::function<void()> FreeFunc;
@@ -207,7 +207,7 @@ class ReflectionContext
     }
     return true;
   }
-#endif // __APPLE__
+#endif // defined(__APPLE__) && defined(__MACH__)
 
   void addReflectionInfo(ReflectionInfo I) {
     getBuilder().addReflectionInfo(I);

include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -59,7 +59,7 @@ void
 swift_reflection_addReflectionInfo(SwiftReflectionContextRef ContextRef,
                                    swift_reflection_info_t Info);
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 /// Add reflection information from a loaded Swift image.
 /// Returns true on success, false if the image's memory couldn't be read.
 int

include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h

@@ -20,7 +20,7 @@
 #ifndef SWIFT_REMOTE_MIRROR_LEGACY_INTEROP_H
 #define SWIFT_REMOTE_MIRROR_LEGACY_INTEROP_H
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 
 #include "SwiftRemoteMirror.h"
 
@@ -880,7 +880,7 @@ size_t swift_reflection_interop_demangle(SwiftReflectionInteropContextRef Contex
 
 /// @}
 
-#endif // __APPLE__
+#endif // defined(__APPLE__) && defined(__MACH__)
 
 #endif // SWIFT_REMOTE_MIRROR_LEGACY_INTEROP_H
 

stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -16,7 +16,7 @@
 #include "swift/Runtime/Unreachable.h"
 #include "swift/SwiftRemoteMirror/SwiftRemoteMirror.h"
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #include <mach-o/getsect.h>
 #endif
 
@@ -89,7 +89,7 @@ swift_reflection_addReflectionInfo(SwiftReflectionContextRef ContextRef,
   Context->addReflectionInfo(*reinterpret_cast<ReflectionInfo *>(&Info));
 }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #ifndef __LP64__
 typedef const struct mach_header MachHeader;
 #else

tools/swift-reflection-dump/swift-reflection-dump.cpp

@@ -83,7 +83,7 @@ static T unwrap(llvm::Expected<T> value) {
   exit(EXIT_FAILURE);
 }
 
-#ifndef __APPLE__
+#if !(defined(__APPLE__) && defined(__MACH__))
 static SectionRef getSectionRef(const ObjectFile *objectFile,
                                 ArrayRef<StringRef> anySectionNames) {
   for (auto section : objectFile->sections()) {
@@ -150,7 +150,7 @@ static ReflectionInfo findReflectionInfo(const ObjectFile *objectFile) {
       /*RemoteStartAddress*/ startAddress,
   };
 }
-#endif // __APPLE__
+#endif // defined(__APPLE__) && defined(__MACH__)
 
 using NativeReflectionContext
   = ReflectionContext<External<RuntimeTarget<sizeof(uintptr_t)>>>;
@@ -255,7 +255,7 @@ static int doDumpReflectionSections(ArrayRef<std::string> binaryFilenames,
     objectOwners.push_back(std::move(objectOwner));
     objectFiles.push_back(objectFile);
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
     context.addImage(RemoteAddress((uint64_t)(objectFile->getData().begin())));
 #else
     context.addReflectionInfo(findReflectionInfo(objectFile));