[RemoteMirrors] Move the interop typedefs into a separate header for API clients that just want to pass the types around.

Author: mikeash

include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h

@@ -22,33 +22,16 @@
 
 #if defined(__APPLE__) && defined(__MACH__)
 
+#include "SwiftRemoteMirrorLegacyInteropTypes.h"
 #include "SwiftRemoteMirror.h"
 
 #include <dlfcn.h>
 #include <mach-o/getsect.h>
 
-#define SWIFT_LEGACY_METADATA_MIN_VERSION 3
-
-/// The remote representation of a Swift metada pointer as returned by
-/// interop wrappers.
-typedef struct swift_metadata_interop {
-  uintptr_t Metadata;
-  int Library;
-} swift_metadata_interop_t;
-
-/// The remote representation of a Swift typeref as returned by interop
-/// wrappers.
-typedef struct swift_typeref_interop {
-  swift_typeref_t Typeref;
-  int Library;
-} swift_typeref_interop_t;
-
 /// The "public" interface follows. All of these functions are the same
 /// as the corresponding swift_reflection_* functions, except for taking
 /// or returning _interop data types in some circumstances.
 
-typedef struct SwiftReflectionInteropContext *SwiftReflectionInteropContextRef;
-
 static inline SwiftReflectionInteropContextRef
 swift_reflection_interop_createReflectionContext(
     void *ReaderContext,
@@ -153,6 +136,9 @@ size_t swift_reflection_interop_demangle(SwiftReflectionInteropContextRef Contex
 /// \name Internal implementation details, clients don't need to use these.
 /// @{
 
+/// The minimum supported metadata version for the legacy library.
+#define SWIFT_LEGACY_METADATA_MIN_VERSION 3
+
 /// The legacy reflection info struct.
 typedef struct swift_reflection_legacy_info {
   swift_reflection_section_t fieldmd;

include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInteropTypes.h

@@ -0,0 +1,43 @@
+//===--- SwiftRemoteMirrorLegacyInteropTypes.h - Legacy lib interop types. ------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------------===//
+///
+/// \file
+/// This header provides an interface for using multiple versions of the Swift remote
+/// mirror library to inspect processes built with different versions of Swift, or
+/// processes where different libraries are built with different versions of Swift.
+///
+//===----------------------------------------------------------------------------===//
+
+#ifndef SWIFT_REMOTE_MIRROR_LEGACY_INTEROP_TYPES_H
+#define SWIFT_REMOTE_MIRROR_LEGACY_INTEROP_TYPES_H
+
+#include "SwiftRemoteMirror.h"
+
+/// The remote representation of a Swift metada pointer as returned by
+/// interop wrappers.
+typedef struct swift_metadata_interop {
+  uintptr_t Metadata;
+  int Library;
+} swift_metadata_interop_t;
+
+/// The remote representation of a Swift typeref as returned by interop
+/// wrappers.
+typedef struct swift_typeref_interop {
+  swift_typeref_t Typeref;
+  int Library;
+} swift_typeref_interop_t;
+
+/// An opaque reflection context object.
+typedef struct SwiftReflectionInteropContext *SwiftReflectionInteropContextRef;
+
+#endif // SWIFT_REMOTE_MIRROR_LEGACY_INTEROP_TYPES_H
+