Revised SwiftRemoteMirror C API

Some minor changes to the SwiftRemoteMirror C API, NFC yet.

Author: bitjammer

include/swift/Reflection/ReflectionContext.h

@@ -680,18 +680,17 @@ class ReflectionContext {
       SWIFT_UNKNOWN,
       NULL,
       0,
+      0,
       0
     };
   }
 
-  swift_fieldinfo_t getInfoForField(const TypeRef *TR, unsigned Index) {
+  swift_childinfo_t getInfoForChild(const TypeRef *TR, unsigned Index) {
     // TODO
     return {
-      NOTAPOINTER,
       0,
       NULL,
       0,
-      0
     };
   }
 };

include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -56,9 +56,6 @@ swift_reflection_addReflectionInfo(SwiftReflectionContextRef ContextRef,
                                    swift_reflection_section_t assocty);
 
 
-/// Clear any caching of field type information for all known heap instances.
-void swift_reflection_clearCaches(SwiftReflectionContextRef Context);
-
 /// Returns an opaque type reference for a metadata pointer, or
 /// NULL if one can't be constructed.
 swift_typeref_t
@@ -70,8 +67,8 @@ swift_typeinfo_t
 swift_reflection_infoForTypeRef(SwiftReflectionContextRef ContextRef,
                                 swift_typeref_t OpaqueTypeRef);
 
-/// Returns the information about a stored property by index.
-swift_fieldinfo_t
+/// Returns the information about a child by index.
+swift_childinfo_t
 swift_reflection_infoForField(SwiftReflectionContextRef ContextRef,
                               swift_typeref_t OpaqueTypeRef,
                               unsigned Index);

include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h

@@ -39,49 +39,42 @@ typedef struct swift_reflection_section_t {
 } swift_reflection_section_t;
 
 /// The kind of a Swift type.
-typedef enum swift_typeref_kind_t {
-  SWIFT_CLASS,
+typedef enum swift_layout_kind_t {
+  SWIFT_STRONG_POINTER,
+  SWIFT_WEAK_POINTER,
+  SWIFT_UNOWNED_POINTER,
+  SWIFT_UNMANAGED_POINTER,
   SWIFT_STRUCT,
   SWIFT_TUPLE,
+  SWIFT_THICK_FUNCTION,
+  SWIFT_THIN_FUNCTION,
+  OBJC_BLOCK,
   SWIFT_CLOSURE_CONTEXT,
-  SWIFT_DICTIONARY_OWNER,
-  SWIFT_SET_OWNER,
-  SWIFT_ARRAY_OWNER,
+  SWIFT_BOX,
   SWIFT_UNKNOWN
 } swift_layout_kind_t;
 
 /// A basic description of a Swift type's.
 typedef struct swift_typeinfo_t {
   swift_layout_kind_t LayoutKind;
 
-  /// The demangled type name.
-  const char *TypeName;
+  const char *MangledTypeName;
 
   size_t Size;
-  size_t Stride;
+  size_t InstanceSize;
+  size_t Alignment;
 } swift_typeinfo_t;
 
-typedef enum swift_reference_kind_t {
-  STRONG,
-  WEAK,
-  UNOWNED,
-  UNMANAGED,
-  NOTAPOINTER
-} swift_reference_kind_t;
-
-typedef struct swift_fieldinfo_t {
-  swift_reference_kind_t ReferenceKind;
+typedef struct swift_childinfo_t {
   swift_typeref_t TypeRef;
-  const char *FieldName;
+  const char *Name;
   size_t Offset;
-  size_t Size;
-} swift_fieldinfo_t;
+} swift_childinfo_t;
 
 /// \brief An opaque pointer to a context which maintains state and
 /// caching of reflection structure for heap instances.
 typedef struct SwiftReflectionContext *SwiftReflectionContextRef;
 
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -52,11 +52,6 @@ swift_reflection_addReflectionInfo(SwiftReflectionContextRef ContextRef,
   Context->addReflectionInfo(Info);
 }
 
-void swift_reflection_clearCaches(SwiftReflectionContextRef ContextRef) {
-  auto Context = reinterpret_cast<NativeReflectionContext *>(ContextRef);
-  Context->clear();
-}
-
 swift_typeref_t
 swift_reflection_typeRefForMetadata(SwiftReflectionContextRef ContextRef,
                                     uintptr_t metadata) {
@@ -87,12 +82,12 @@ swift_reflection_infoForTypeRef(SwiftReflectionContextRef ContextRef,
   return Context->getInfoForTypeRef(TR);
 }
 
-swift_fieldinfo_t
-swift_reflection_infoForField(SwiftReflectionContextRef ContextRef,
+swift_childinfo_t
+swift_reflection_infoForChild(SwiftReflectionContextRef ContextRef,
                               swift_typeref_t OpaqueTypeRef,
                               unsigned Index) {
   auto Context = reinterpret_cast<NativeReflectionContext *>(ContextRef);
   auto TR = reinterpret_cast<TypeRef *>(OpaqueTypeRef);
-  return Context->getInfoForField(TR, Index);
+  return Context->getInfoForChild(TR, Index);
 }