feat: Serialize protocols lists in binary metadata

Save protocols list in `IdEncoding` and `InterfaceDeclarationReferenceEncoding`

Author: mbektchiev

src/Binary/binaryStructures.cpp

@@ -98,6 +98,13 @@ binary::MetaFileOffset binary::TypeEncoding::save(binary::BinaryWriter& writer)
     return writer.push_byte(this->_type);
 }
 
+binary::MetaFileOffset binary::IdEncoding::save(binary::BinaryWriter& writer)
+{
+    binary::MetaFileOffset offset = TypeEncoding::save(writer);
+    writer.push_pointer(this->_protocols);
+    return offset;
+}
+
 binary::MetaFileOffset binary::IncompleteArrayEncoding::save(binary::BinaryWriter& writer)
 {
     binary::MetaFileOffset offset = TypeEncoding::save(writer);
@@ -128,6 +135,13 @@ binary::MetaFileOffset binary::DeclarationReferenceEncoding::save(binary::Binary
     return offset;
 }
 
+binary::MetaFileOffset binary::InterfaceDeclarationReferenceEncoding::save(binary::BinaryWriter& writer)
+{
+    binary::MetaFileOffset offset = DeclarationReferenceEncoding::save(writer);
+    writer.push_pointer(this->_protocols);
+    return offset;
+}
+
 binary::MetaFileOffset binary::PointerEncoding::save(binary::BinaryWriter& writer)
 {
     binary::MetaFileOffset offset = TypeEncoding::save(writer);

src/Binary/binaryStructures.h

@@ -256,6 +256,18 @@ struct TypeEncoding {
     virtual ~TypeEncoding() { }
 };
 
+struct IdEncoding : public TypeEncoding {
+public:
+    IdEncoding()
+    : TypeEncoding(BinaryTypeEncodingType::Id)
+    {
+    }
+    
+    MetaFileOffset _protocols;
+
+    virtual MetaFileOffset save(BinaryWriter& writer) override;
+};
+
 struct IncompleteArrayEncoding : public TypeEncoding {
 public:
     IncompleteArrayEncoding()
@@ -302,7 +314,19 @@ struct DeclarationReferenceEncoding : public TypeEncoding {
     }
 
     MetaFileOffset _name;
+    
+    virtual MetaFileOffset save(BinaryWriter& writer) override;
+};
 
+struct InterfaceDeclarationReferenceEncoding : public DeclarationReferenceEncoding {
+public:
+    InterfaceDeclarationReferenceEncoding()
+    : DeclarationReferenceEncoding(BinaryTypeEncodingType::InterfaceDeclarationReference)
+    {
+    }
+    
+    MetaFileOffset _protocols;
+    
     virtual MetaFileOffset save(BinaryWriter& writer) override;
 };
 

src/Binary/binaryTypeEncodingSerializer.cpp

@@ -124,7 +124,14 @@ unique_ptr<binary::TypeEncoding> binary::BinaryTypeEncodingSerializer::visitProt
 
 unique_ptr<binary::TypeEncoding> binary::BinaryTypeEncodingSerializer::visitId(const ::Meta::IdType& type)
 {
-    return llvm::make_unique<binary::TypeEncoding>(binary::BinaryTypeEncodingType::Id); // TODO: Add protocols
+    auto s = llvm::make_unique<binary::IdEncoding>();
+    std::vector<MetaFileOffset> offsets;
+    for (auto protocol : type.protocols) {
+        offsets.push_back(this->_heapWriter.push_string(protocol->jsName));
+    }
+    s->_protocols = this->_heapWriter.push_binaryArray(offsets);
+
+    return unique_ptr<binary::TypeEncoding>(s.release());
 }
 
 unique_ptr<binary::TypeEncoding> binary::BinaryTypeEncodingSerializer::visitConstantArray(const ::Meta::ConstantArrayType& type)
@@ -144,8 +151,15 @@ unique_ptr<binary::TypeEncoding> binary::BinaryTypeEncodingSerializer::visitInco
 
 unique_ptr<binary::TypeEncoding> binary::BinaryTypeEncodingSerializer::visitInterface(const ::Meta::InterfaceType& type)
 {
-    binary::DeclarationReferenceEncoding* s = new binary::DeclarationReferenceEncoding(BinaryTypeEncodingType::InterfaceDeclarationReference);
+    auto* s = new binary::InterfaceDeclarationReferenceEncoding();
     s->_name = this->_heapWriter.push_string(type.interface->jsName);
+    
+    std::vector<MetaFileOffset> offsets;
+    for (auto protocol : type.protocols) {
+        offsets.push_back(this->_heapWriter.push_string(protocol->jsName));
+    }
+    s->_protocols = this->_heapWriter.push_binaryArray(offsets);
+    
     return unique_ptr<binary::TypeEncoding>(s);
 }
 
@@ -157,8 +171,12 @@ unique_ptr<binary::TypeEncoding> binary::BinaryTypeEncodingSerializer::visitBrid
     if (type.bridgedInterface == nullptr) {
         throw logic_error(std::string("Unresolved bridged interface for BridgedInterfaceType with name '") + type.bridgedInterface->name + "'.");
     }
-    binary::DeclarationReferenceEncoding* s = new binary::DeclarationReferenceEncoding(BinaryTypeEncodingType::InterfaceDeclarationReference);
+    auto s = new binary::InterfaceDeclarationReferenceEncoding();
     s->_name = this->_heapWriter.push_string(type.bridgedInterface->jsName);
+
+    std::vector<MetaFileOffset> offsets;
+    s->_protocols = this->_heapWriter.push_binaryArray(offsets);
+    
     return unique_ptr<binary::TypeEncoding>(s);
 }