Merge pull request #2335 from bitjammer/swift-reflection-test-C

swift-reflection-test: Target SwiftRemoteMirror C API

Author: bitjammer

include/swift/Remote/CMemoryReader.h

@@ -72,7 +72,7 @@ class CMemoryReader final : public MemoryReader {
 
   bool readBytes(RemoteAddress address, uint8_t *dest, uint64_t size) override {
     return Impl.readBytes(Impl.reader_context,
-                          address.getAddressData(), dest, size);
+                          address.getAddressData(), dest, size) != 0;
   }
 };
 

include/swift/SwiftRemoteMirror/MemoryReaderInterface.h

@@ -30,7 +30,7 @@ typedef uint64_t addr_t;
 
 typedef uint8_t (*PointerSizeFunction)(void *reader_context);
 typedef uint8_t (*SizeSizeFunction)(void * reader_context);
-typedef bool (*ReadBytesFunction)(void * reader_context, addr_t address,
+typedef int (*ReadBytesFunction)(void * reader_context, addr_t address,
                                   uint8_t *dest, uint64_t size);
 typedef uint64_t (*GetStringLengthFunction)(void * reader_context,
                                             addr_t address);

include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h

@@ -20,6 +20,7 @@
 #ifndef SWIFT_REFLECTION_SWIFT_REFLECTION_H
 #define SWIFT_REFLECTION_SWIFT_REFLECTION_H
 
+#include "MemoryReaderInterface.h"
 #include "SwiftRemoteMirrorTypes.h"
 
 /// Major version changes when there are ABI or source incompatible changes.
@@ -117,11 +118,11 @@ swift_reflection_genericArgumentOfTypeRef(swift_typeref_t OpaqueTypeRef,
 ///
 /// Returns true if InstanceTypeRef and StartOfInstanceData contain valid
 /// valid values.
-bool swift_reflection_projectExistential(SwiftReflectionContextRef ContextRef,
-                                         addr_t InstanceAddress,
-                                         swift_typeref_t ExistentialTypeRef,
-                                         swift_typeref_t *OutInstanceTypeRef,
-                                         addr_t *OutStartOfInstanceData);
+int swift_reflection_projectExistential(SwiftReflectionContextRef ContextRef,
+                                        addr_t InstanceAddress,
+                                        swift_typeref_t ExistentialTypeRef,
+                                        swift_typeref_t *OutInstanceTypeRef,
+                                        addr_t *OutStartOfInstanceData);
 
 /// Dump a brief description of the typeref as a tree to stderr.
 void swift_reflection_dumpTypeRef(swift_typeref_t OpaqueTypeRef);

include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h

@@ -18,6 +18,8 @@
 #ifndef SWIFT_REMOTE_MIRROR_TYPES_H
 #define SWIFT_REMOTE_MIRROR_TYPES_H
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -15,8 +15,6 @@
 #include "swift/Remote/CMemoryReader.h"
 #include "swift/SwiftRemoteMirror/SwiftRemoteMirror.h"
 
-#include <iostream>
-
 using namespace swift;
 using namespace swift::reflection;
 using namespace swift::remote;
@@ -214,11 +212,11 @@ swift_reflection_childOfMetadata(SwiftReflectionContextRef ContextRef,
   return convertChild(TI, Index);
 }
 
-bool swift_reflection_project_existential(SwiftReflectionContextRef ContextRef,
-                                          addr_t InstanceAddress,
-                                          swift_typeref_t ExistentialTypeRef,
-                                          swift_typeref_t *InstanceTypeRef,
-                                          addr_t *StartOfInstanceData) {
+int swift_reflection_project_existential(SwiftReflectionContextRef ContextRef,
+                                         addr_t InstanceAddress,
+                                         swift_typeref_t ExistentialTypeRef,
+                                         swift_typeref_t *InstanceTypeRef,
+                                         addr_t *StartOfInstanceData) {
   // TODO
   return false;
 }

test/lit.cfg

@@ -861,7 +861,7 @@ config.substitutions.append(
      (subst_target_swift_ide_test_mock_sdk,
       subst_target_swift_ide_test_mock_sdk_after)))
 config.substitutions.append(('%target-swift-ide-test', config.target_swift_ide_test))
-config.substitutions.append(('%target-swift-reflection-test', 'swift-reflection-test{variant_suffix} {arch}'.format(variant_suffix=config.variant_suffix, arch=run_cpu)))
+config.substitutions.append(('%target-swift-reflection-test', 'swift-reflection-test{variant_suffix}'.format(variant_suffix=config.variant_suffix)))
 config.substitutions.append(('%target-swift-reflection-dump', '{} {} {}'.format(config.swift_reflection_dump, '-arch', run_cpu)))
 config.substitutions.append(('%target-swiftc_driver', config.target_swiftc_driver))
 config.substitutions.append(('%target-swift-remoteast-test-with-sdk',

tools/swift-reflection-test/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_swift_target_executable(swift-reflection-test BUILD_WITH_STDLIB
-  swift-reflection-test.cpp
-  overrides.cpp
+  swift-reflection-test.c
+  overrides.c
   LINK_FAT_LIBRARIES
-    swiftReflection
     swiftRemoteMirror)
 

tools/swift-reflection-test/overrides.cpp renamed to tools/swift-reflection-test/overrides.c

@@ -1,9 +1,7 @@
 #include "overrides.h"
 
-extern "C" {
 extern pid_t fork(void);
 extern int execv(const char *path, char * const *argv);
-}
 
 pid_t _fork(void) {
   return fork();