Merge pull request #27081 from ismetanin/SR-7165

SR-7165. Excise <iostream> from reflection

Author: jrose-apple

include/swift/Demangling/Demangler.h

@@ -23,11 +23,6 @@
 
 //#define NODE_FACTORY_DEBUGGING
 
-#ifdef NODE_FACTORY_DEBUGGING
-#include <iostream>
-#endif
-
-
 using namespace swift::Demangle;
 using llvm::StringRef;
 
@@ -86,7 +81,7 @@ class NodeFactory {
 
   NodeFactory() {
 #ifdef NODE_FACTORY_DEBUGGING
-    std::cerr << indent() << "## New NodeFactory\n";
+    fprintf(stderr, "%s## New NodeFactory\n", indent().c_str());
     nestingLevel++;
 #endif
   }
@@ -96,8 +91,7 @@ class NodeFactory {
   /// Only if this memory overflows, the factory begins to malloc.
   void providePreallocatedMemory(char *Memory, size_t Size) {
 #ifdef NODE_FACTORY_DEBUGGING
-    std::cerr << indent() << "++ provide preallocated memory, size = "
-                          << Size << '\n';
+    fprintf(stderr, "%s++ provide preallocated memory, size = %zu\n", indent().c_str(), Size);
 #endif
     assert(!CurPtr && !End && !CurrentSlab);
     CurPtr = Memory;
@@ -116,17 +110,15 @@ class NodeFactory {
     CurPtr = BorrowFrom.CurPtr;
     End = BorrowFrom.End;
 #ifdef NODE_FACTORY_DEBUGGING
-    std::cerr << indent() << "++ borrow memory, size = "
-                          << (End - CurPtr) << '\n';
+    fprintf(stderr, "%s++ borrow memory, size = %zu\n", indent().c_str(), (End - CurPtr));
 #endif
   }
 
   virtual ~NodeFactory() {
     freeSlabs(CurrentSlab);
 #ifdef NODE_FACTORY_DEBUGGING
     nestingLevel--;
-    std::cerr << indent() << "## Delete NodeFactory: allocated memory = "
-                          << allocatedMemory  << '\n';
+    fprintf(stderr, "%s## Delete NodeFactory: allocated memory = %zu\n", indent().c_str(), allocatedMemory)
 #endif
     if (BorrowedFrom) {
       BorrowedFrom->isBorrowed = false;
@@ -141,8 +133,7 @@ class NodeFactory {
     size_t ObjectSize = NumObjects * sizeof(T);
     CurPtr = align(CurPtr, alignof(T));
 #ifdef NODE_FACTORY_DEBUGGING
-    std::cerr << indent() << "alloc " << ObjectSize << ", CurPtr = "
-              << (void *)CurPtr << "\n";
+    fprintf(stderr, "%salloc %zu, CurPtr = %p\n", indent().c_str(), ObjectSize, (void *)CurPtr)
     allocatedMemory += ObjectSize;
 #endif
 
@@ -163,9 +154,8 @@ class NodeFactory {
       End = (char *)newSlab + AllocSize;
       assert(CurPtr + ObjectSize <= End);
 #ifdef NODE_FACTORY_DEBUGGING
-      std::cerr << indent() << "** new slab " << newSlab << ", allocsize = "
-                << AllocSize << ", CurPtr = " << (void *)CurPtr
-                << ", End = " << (void *)End << "\n";
+      fprintf(stderr, "%s** new slab %p, allocsize = %zu, CurPtr = %p, End = %p\n",
+            indent().c_str(), newSlab, AllocSize, (void *)CurPtr, (void *)End);
 #endif
     }
     T *AllocatedObj = (T *)CurPtr;
@@ -189,9 +179,8 @@ class NodeFactory {
     size_t AdditionalAlloc = MinGrowth * sizeof(T);
 
 #ifdef NODE_FACTORY_DEBUGGING
-    std::cerr << indent() << "realloc: capacity = " << Capacity
-              << " (size = " << OldAllocSize << "), growth = " << MinGrowth
-              << " (size = " << AdditionalAlloc << ")\n";
+    fprintf(stderr, "%srealloc: capacity = %d (size = %zu), growth = %zu (size = %zu)\n",
+          indent().c_str(), Capacity, OldAllocSize, MinGrowth, AdditionalAlloc);
 #endif
     if ((char *)Objects + OldAllocSize == CurPtr
         && CurPtr + AdditionalAlloc <= End) {
@@ -200,7 +189,7 @@ class NodeFactory {
       CurPtr += AdditionalAlloc;
       Capacity += MinGrowth;
 #ifdef NODE_FACTORY_DEBUGGING
-      std::cerr << indent() << "** can grow: " << (void *)CurPtr << '\n';
+      fprintf(stderr, "%s** can grow: %p\n", indent().c_str(), (void *)CurPtr);
       allocatedMemory += AdditionalAlloc;
 #endif
       return;

include/swift/Reflection/MetadataSource.h

@@ -177,7 +177,7 @@ class MetadataSource {
   }
 
   void dump() const;
-  void dump(std::ostream &OS, unsigned Indent = 0) const;
+  void dump(FILE *file, unsigned Indent = 0) const;
   template <typename Allocator>
   static const MetadataSource *decode(Allocator &A, const std::string &str) {
     auto begin = str.begin();

include/swift/Reflection/ReflectionContext.h

@@ -31,7 +31,6 @@
 #include "swift/Reflection/TypeRefBuilder.h"
 #include "swift/Runtime/Unreachable.h"
 
-#include <iostream>
 #include <set>
 #include <vector>
 #include <unordered_map>

include/swift/Reflection/TypeLowering.h

@@ -23,7 +23,6 @@
 #include "llvm/Support/Casting.h"
 #include "swift/Remote/MetadataReader.h"
 
-#include <iostream>
 #include <memory>
 
 namespace swift {
@@ -134,7 +133,7 @@ class TypeInfo {
   bool isBitwiseTakable() const { return BitwiseTakable; }
 
   void dump() const;
-  void dump(std::ostream &OS, unsigned Indent = 0) const;
+  void dump(FILE *file, unsigned Indent = 0) const;
 };
 
 struct FieldInfo {

include/swift/Reflection/TypeRef.h

@@ -24,8 +24,6 @@
 #include "swift/Remote/MetadataReader.h"
 #include "swift/Runtime/Unreachable.h"
 
-#include <iostream>
-
 namespace swift {
 namespace reflection {
 
@@ -150,7 +148,7 @@ class alignas(void *) TypeRef {
   }
 
   void dump() const;
-  void dump(std::ostream &OS, unsigned Indent = 0) const;
+  void dump(FILE *file, unsigned Indent = 0) const;
 
   bool isConcrete() const;
   bool isConcreteAfterSubstitutions(const GenericArgumentMap &Subs) const;

include/swift/Reflection/TypeRefBuilder.h

@@ -25,7 +25,6 @@
 #include "swift/Reflection/TypeRef.h"
 #include "llvm/ADT/Optional.h"
 
-#include <iostream>
 #include <vector>
 #include <unordered_map>
 
@@ -211,7 +210,7 @@ struct ClosureContextInfo {
   unsigned NumBindings = 0;
 
   void dump() const;
-  void dump(std::ostream &OS) const;
+  void dump(FILE *file) const;
 };
 
 struct FieldTypeInfo {
@@ -653,13 +652,13 @@ class TypeRefBuilder {
   /// Dumping typerefs, field declarations, associated types
   ///
 
-  void dumpTypeRef(RemoteRef<char> mangledName,
-                   std::ostream &OS, bool printTypeName = false);
-  void dumpFieldSection(std::ostream &OS);
-  void dumpAssociatedTypeSection(std::ostream &OS);
-  void dumpBuiltinTypeSection(std::ostream &OS);
-  void dumpCaptureSection(std::ostream &OS);
-  void dumpAllSections(std::ostream &OS);
+  void dumpTypeRef(RemoteRef<char> MangledName,
+                   FILE *file, bool printTypeName = false);
+  void dumpFieldSection(FILE *file);
+  void dumpAssociatedTypeSection(FILE *file);
+  void dumpBuiltinTypeSection(FILE *file);
+  void dumpCaptureSection(FILE *file);
+  void dumpAllSections(FILE *file);
 };
 
 

lib/Demangling/Demangler.cpp

@@ -412,7 +412,7 @@ void NodeFactory::clear() {
   assert(!isBorrowed);
   if (CurrentSlab) {
 #ifdef NODE_FACTORY_DEBUGGING
-    std::cerr << indent() << "## clear: allocated memory = " << allocatedMemory  << "\n";
+    fprintf(stderr, "%s## clear: allocated memory = %zu\n", indent().c_str(), allocatedMemory);
 #endif
 
     freeSlabs(CurrentSlab->Previous);

stdlib/public/Reflection/MetadataSource.cpp

@@ -19,70 +19,69 @@ using namespace reflection;
 
 class PrintMetadataSource
   : public MetadataSourceVisitor<PrintMetadataSource, void> {
-  std::ostream &OS;
+  FILE *file;
   unsigned Indent;
 
-  std::ostream &indent(unsigned Amount) {
+  FILE * indent(unsigned Amount) {
     for (unsigned i = 0; i < Amount; ++i)
-      OS << ' ';
-    return OS;
+      fprintf(file, " ");
+    return file;
   }
 
-  std::ostream &printHeader(std::string Name) {
-    indent(Indent) << '(' << Name;
-    return OS;
+  FILE * printHeader(std::string Name) {
+    fprintf(indent(Indent), "(%s", Name.c_str());
+    return file;
   }
 
-  template<typename T>
-  std::ostream &printField(std::string name, const T &value) {
+  FILE * printField(std::string name, std::string value) {
     if (!name.empty())
-      OS << " " << name << "=" << value;
+      fprintf(file, " %s=%s", name.c_str(), value.c_str());
     else
-      OS << " " << value;
-    return OS;
+      fprintf(file, " %s", value.c_str());
+    return file;
   }
 
   void printRec(const MetadataSource *MS) {
-    OS << "\n";
+    fprintf(file, "\n");
 
     Indent += 2;
     visit(MS);
     Indent -= 2;
   }
 
   void closeForm() {
-    OS << ')';
+    fprintf(file, ")");
   }
 
 public:
-  PrintMetadataSource(std::ostream &OS, unsigned Indent)
-    : OS(OS), Indent(Indent) {}
+  PrintMetadataSource(FILE *file, unsigned Indent)
+    : file(file), Indent(Indent) {}
 
   void
   visitClosureBindingMetadataSource(const ClosureBindingMetadataSource *CB) {
     printHeader("closure_binding");
-    printField("index", CB->getIndex());
+    printField("index", std::to_string(CB->getIndex()));
     closeForm();
   }
 
   void
   visitReferenceCaptureMetadataSource(const ReferenceCaptureMetadataSource *RC){
     printHeader("reference_capture");
-    printField("index", RC->getIndex());
+    printField("index", std::to_string(RC->getIndex()));
     closeForm();
   }
 
   void
   visitMetadataCaptureMetadataSource(const MetadataCaptureMetadataSource *MC){
     printHeader("metadata_capture");
-    printField("index", MC->getIndex());
+    printField("index", std::to_string(MC->getIndex()));
     closeForm();
   }
 
   void
   visitGenericArgumentMetadataSource(const GenericArgumentMetadataSource *GA) {
     printHeader("generic_argument");
-    printField("index", GA->getIndex());
+    printField("index", std::to_string(GA->getIndex()));
     printRec(GA->getSource());
     closeForm();
   }
@@ -100,10 +99,10 @@ class PrintMetadataSource
 };
 
 void MetadataSource::dump() const {
-  dump(std::cerr, 0);
+  dump(stderr, 0);
 }
 
-void MetadataSource::dump(std::ostream &OS, unsigned Indent) const {
-  PrintMetadataSource(OS, Indent).visit(this);
-  OS << '\n';
+void MetadataSource::dump(FILE *file, unsigned Indent) const {
+  PrintMetadataSource(file, Indent).visit(this);
+  fprintf(file, "\n");
 }