Reflection: Add RecordTypeInfoBuilder class to TypeLowering.h, NFC

Closure context layout uses this class.

Author: slavapestov

include/swift/Reflection/TypeLowering.h

@@ -202,6 +202,29 @@ class TypeConverter {
   }
 };
 
+/// Utility class for performing universal layout for types such as
+/// tuples, structs, thick functions, etc.
+class RecordTypeInfoBuilder {
+  TypeConverter &TC;
+  unsigned Size, Alignment, Stride, NumExtraInhabitants;
+  RecordKind Kind;
+  std::vector<FieldInfo> Fields;
+  bool Invalid;
+
+public:
+  RecordTypeInfoBuilder(TypeConverter &TC, RecordKind Kind)
+    : TC(TC), Size(0), Alignment(1), Stride(0), NumExtraInhabitants(0),
+      Kind(Kind), Invalid(false) {}
+
+  bool isInvalid() const {
+    return Invalid;
+  }
+
+  unsigned addField(unsigned fieldSize, unsigned fieldAlignment);
+  void addField(const std::string &Name, const TypeRef *TR);
+  const RecordTypeInfo *build();
+};
+
 }
 }
 

stdlib/public/Reflection/TypeLowering.cpp

@@ -186,69 +186,6 @@ class BuiltinTypeInfo : public TypeInfo {
   }
 };
 
-/// Utility class for performing universal layout for types such as
-/// tuples, structs, thick functions, etc.
-class RecordTypeInfoBuilder {
-  TypeConverter &TC;
-  unsigned Size, Alignment, Stride, NumExtraInhabitants;
-  RecordKind Kind;
-  std::vector<FieldInfo> Fields;
-  bool Invalid;
-
-public:
-  RecordTypeInfoBuilder(TypeConverter &TC, RecordKind Kind)
-    : TC(TC), Size(0), Alignment(1), Stride(0), NumExtraInhabitants(0),
-      Kind(Kind), Invalid(false) {}
-
-  unsigned addField(unsigned fieldSize, unsigned fieldAlignment) {
-    // Align the current size appropriately
-    Size = ((Size + fieldAlignment - 1) & ~(fieldAlignment - 1));
-
-    // Record the offset
-    unsigned offset = Size;
-
-    // Update the aggregate size
-    Size += fieldSize;
-
-    // Update the aggregate alignment
-    Alignment = std::max(Alignment, fieldAlignment);
-
-    // Re-calculate the stride
-    Stride = ((Size + Alignment - 1) & ~(Alignment - 1));
-
-    return offset;
-  }
-
-  void addField(const std::string &Name, const TypeRef *TR) {
-    const TypeInfo *TI = TC.getTypeInfo(TR);
-    if (TI == nullptr) {
-      Invalid = true;
-      return;
-    }
-
-    // FIXME: I just made this up
-    if (Size == 0)
-      NumExtraInhabitants = TI->getNumExtraInhabitants();
-    else
-      NumExtraInhabitants = 0;
-
-    unsigned fieldSize = TI->getSize();
-    unsigned fieldAlignment = TI->getAlignment();
-
-    unsigned fieldOffset = addField(fieldSize, fieldAlignment);
-    Fields.push_back({Name, fieldOffset, TR, *TI});
-  }
-
-  const RecordTypeInfo *build() {
-    if (Invalid)
-      return nullptr;
-
-    return TC.makeTypeInfo<RecordTypeInfo>(
-        Size, Alignment, Stride,
-        NumExtraInhabitants, Kind, Fields);
-  }
-};
-
 /// Utility class for building values that contain witness tables.
 class ExistentialTypeInfoBuilder {
   TypeConverter &TC;
@@ -361,6 +298,56 @@ class ExistentialTypeInfoBuilder {
 
 }
 
+unsigned RecordTypeInfoBuilder::addField(unsigned fieldSize,
+                                         unsigned fieldAlignment) {
+  // Align the current size appropriately
+  Size = ((Size + fieldAlignment - 1) & ~(fieldAlignment - 1));
+
+  // Record the offset
+  unsigned offset = Size;
+
+  // Update the aggregate size
+  Size += fieldSize;
+
+  // Update the aggregate alignment
+  Alignment = std::max(Alignment, fieldAlignment);
+
+  // Re-calculate the stride
+  Stride = ((Size + Alignment - 1) & ~(Alignment - 1));
+
+  return offset;
+}
+
+void RecordTypeInfoBuilder::addField(const std::string &Name,
+                                     const TypeRef *TR) {
+  const TypeInfo *TI = TC.getTypeInfo(TR);
+  if (TI == nullptr) {
+    Invalid = true;
+    return;
+  }
+
+  // FIXME: I just made this up
+  if (Size == 0)
+    NumExtraInhabitants = TI->getNumExtraInhabitants();
+  else
+    NumExtraInhabitants = 0;
+
+  unsigned fieldSize = TI->getSize();
+  unsigned fieldAlignment = TI->getAlignment();
+
+  unsigned fieldOffset = addField(fieldSize, fieldAlignment);
+  Fields.push_back({Name, fieldOffset, TR, *TI});
+}
+
+const RecordTypeInfo *RecordTypeInfoBuilder::build() {
+  if (Invalid)
+    return nullptr;
+
+  return TC.makeTypeInfo<RecordTypeInfo>(
+      Size, Alignment, Stride,
+      NumExtraInhabitants, Kind, Fields);
+}
+
 const ReferenceTypeInfo *
 TypeConverter::getReferenceTypeInfo(ReferenceKind Kind,
                                     ReferenceCounting Refcounting) {