SwiftRemoteMirror: move dump APIs to print to stdout instead of stderr

Rather than move file descriptors around in the tools, just tell the
underlying ::dump methods to print to stdout instead.

Author: bitjammer

stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp

@@ -273,9 +273,9 @@ int swift_reflection_projectExistential(SwiftReflectionContextRef ContextRef,
 void swift_reflection_dumpTypeRef(swift_typeref_t OpaqueTypeRef) {
   auto TR = reinterpret_cast<const TypeRef *>(OpaqueTypeRef);
   if (TR == nullptr) {
-    std::cerr << "<null type reference>\n";
+    std::cout << "<null type reference>\n";
   } else {
-    TR->dump();
+    TR->dump(std::cout);
   }
 }
 
@@ -285,9 +285,9 @@ void swift_reflection_dumpInfoForTypeRef(SwiftReflectionContextRef ContextRef,
   auto TR = reinterpret_cast<const TypeRef *>(OpaqueTypeRef);
   auto TI = Context->getTypeInfo(TR);
   if (TI == nullptr) {
-    std::cerr << "<null type info>\n";
+    std::cout << "<null type info>\n";
   } else {
-    TI->dump();
+    TI->dump(std::cout);
   }
 }
 
@@ -296,9 +296,9 @@ void swift_reflection_dumpInfoForMetadata(SwiftReflectionContextRef ContextRef,
   auto Context = reinterpret_cast<NativeReflectionContext *>(ContextRef);
   auto TI = Context->getMetadataTypeInfo(Metadata);
   if (TI == nullptr) {
-    std::cerr << "<null type info>\n";
+    std::cout << "<null type info>\n";
   } else {
-    TI->dump();
+    TI->dump(std::cout);
   }
 }
 
@@ -307,9 +307,9 @@ void swift_reflection_dumpInfoForInstance(SwiftReflectionContextRef ContextRef,
   auto Context = reinterpret_cast<NativeReflectionContext *>(ContextRef);
   auto TI = Context->getInstanceTypeInfo(Object);
   if (TI == nullptr) {
-    std::cerr << "<null type info>\n";
+    std::cout << "<null type info>\n";
   } else {
-    TI->dump();
+    TI->dump(std::cout);
   }
 }
 

tools/swift-reflection-test/swift-reflection-test.c

@@ -394,15 +394,13 @@ int doDumpHeapInstance(const char *BinaryFilename) {
       close(PipeMemoryReader_getParentWriteFD(&Pipe));
       close(PipeMemoryReader_getParentReadFD(&Pipe));
       dup2(PipeMemoryReader_getChildReadFD(&Pipe), STDIN_FILENO);
-      dup2(PipeMemoryReader_getChildWriteFD(&Pipe), STDERR_FILENO);
       dup2(PipeMemoryReader_getChildWriteFD(&Pipe), STDOUT_FILENO);
       _execv(BinaryFilename, NULL);
       exit(EXIT_SUCCESS);
     }
     default: { // Parent
       close(PipeMemoryReader_getChildReadFD(&Pipe));
       close(PipeMemoryReader_getChildWriteFD(&Pipe));
-      dup2(STDOUT_FILENO, STDERR_FILENO);
       SwiftReflectionContextRef RC = swift_reflection_createReflectionContext(
         (void*)&Pipe,
         PipeMemoryReader_getPointerSize,
@@ -414,7 +412,7 @@ int doDumpHeapInstance(const char *BinaryFilename) {
       uint8_t PointerSize = PipeMemoryReader_getPointerSize((void*)&Pipe);
       if (PointerSize != sizeof(uintptr_t))
         errorAndExit("Child process had unexpected architecture");
-      
+
       PipeMemoryReader_receiveReflectionInfo(RC, &Pipe);
 
       while (1) {

validation-test/Reflection/example.swift

@@ -1,6 +1,6 @@
 // RUN: rm -rf %t && mkdir -p %t
 // RUN: %target-build-swift -Xfrontend -enable-reflection-metadata -Xfrontend -enable-reflection-names -lswiftSwiftReflectionTest %s -o %t/example
-// RUN: %target-run %target-swift-reflection-test %t/example 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize
+// RUN: %target-run %target-swift-reflection-test %t/example | FileCheck %s --check-prefix=CHECK-%target-ptrsize
 // REQUIRES: objc_interop
 
 import SwiftReflectionTest

validation-test/Reflection/existentials.swift

@@ -1,6 +1,6 @@
 // RUN: rm -rf %t && mkdir -p %t
 // RUN: %target-build-swift -Xfrontend -enable-reflection-metadata -Xfrontend -enable-reflection-names -lswiftSwiftReflectionTest %s -o %t/existentials
-// RUN: %target-run %target-swift-reflection-test %t/existentials 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize
+// RUN: %target-run %target-swift-reflection-test %t/existentials | FileCheck %s --check-prefix=CHECK-%target-ptrsize
 // REQUIRES: objc_interop
 
 /*