[stdlib] [reflection] Fix printing, remove & from

Author: ismetanin

include/swift/Demangling/Demangler.h

@@ -133,7 +133,7 @@ class NodeFactory {
     size_t ObjectSize = NumObjects * sizeof(T);
     CurPtr = align(CurPtr, alignof(T));
 #ifdef NODE_FACTORY_DEBUGGING
-    fprintf(stderr, "%salloc%zu, CurPtr = %p\n", indent().c_str(), ObjectSize, (void *)CurPtr)
+    fprintf(stderr, "%salloc %zu, CurPtr = %p\n", indent().c_str(), ObjectSize, (void *)CurPtr)
     allocatedMemory += ObjectSize;
 #endif
 

stdlib/public/Reflection/MetadataSource.cpp

@@ -22,18 +22,18 @@ class PrintMetadataSource
   FILE *file;
   unsigned Indent;
 
-  FILE * &indent(unsigned Amount) {
+  FILE * indent(unsigned Amount) {
     for (unsigned i = 0; i < Amount; ++i)
       fprintf(file, " ");
     return file;
   }
 
-  FILE * &printHeader(std::string Name) {
+  FILE * printHeader(std::string Name) {
     fprintf(indent(Indent), "(%s", Name.c_str());
     return file;
   }
 
-  FILE * &printField(std::string name, std::string value) {
+  FILE * printField(std::string name, std::string value) {
     if (!name.empty())
       fprintf(file, " %s=%s", name.c_str(), value.c_str());
     else

stdlib/public/Reflection/TypeLowering.cpp

@@ -75,7 +75,7 @@ class PrintTypeInfo {
     printField("alignment", std::to_string(TI.getAlignment()));
     printField("stride", std::to_string(TI.getStride()));
     printField("num_extra_inhabitants", std::to_string(TI.getNumExtraInhabitants()));
-    printField("bitwise_takable", TI.isBitwiseTakable() ? "1" : "0");
+    printField("bitwise_takable", TI.isBitwiseTakable() ? "true" : "false");
   }
 
   void printFields(const RecordTypeInfo &TI) {

stdlib/public/Reflection/TypeRefBuilder.cpp

@@ -402,10 +402,10 @@ void TypeRefBuilder::dumpBuiltinTypeSection(FILE *file) {
       auto typeName = nodeToString(typeNode);
 
       fprintf(file, "\n- %s:\n", typeName.c_str());
-      fprintf(file, "Size: %s\n", std::to_string(descriptor->Size).c_str());
-      fprintf(file, "Alignment: %s:\n", std::to_string(descriptor->getAlignment()).c_str());
-      fprintf(file, "Stride: %s:\n", std::to_string(descriptor->Stride).c_str());
-      fprintf(file, "NumExtraInhabitants: %s:\n", std::to_string(descriptor->NumExtraInhabitants).c_str());
+      fprintf(file, "Size: %u\n", descriptor->Size);
+      fprintf(file, "Alignment: %u:\n", descriptor->getAlignment());
+      fprintf(file, "Stride: %u:\n", descriptor->Stride);
+      fprintf(file, "NumExtraInhabitants: %u:\n", descriptor->NumExtraInhabitants);
       fprintf(file, "BitwiseTakable: %d:\n", descriptor->isBitwiseTakable());
     }
   }