Serialization: Fix various problems with SIL serialization of variadic generic instructions

Fixes rdar://108004074.

Author: slavapestov

lib/Serialization/DeserializeSIL.cpp

@@ -1285,11 +1285,10 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     RawOpCode = (unsigned)SILInstructionKind::HasSymbolInst;
     break;
   case SIL_PACK_ELEMENT_GET:
-    SILPackElementGetLayout::readRecord(scratch,
+    SILPackElementGetLayout::readRecord(scratch, RawOpCode,
                                         TyID, TyCategory,
                                         TyID2, TyCategory2, ValID2,
                                         ValID3);
-    RawOpCode = (unsigned)SILInstructionKind::PackElementGetInst;
     break;
   case SIL_PACK_ELEMENT_SET:
     SILPackElementSetLayout::readRecord(scratch,
@@ -1332,7 +1331,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
   }
   case SILInstructionKind::AllocPackInst: {
     assert(RecordKind == SIL_ONE_TYPE && "Layout should be OneType.");
-    ResultInst = Builder.createAllocStack(
+    ResultInst = Builder.createAllocPack(
         Loc, getSILType(MF->getType(TyID), (SILValueCategory)TyCategory, Fn));
     break;
   }

lib/Serialization/SILFormat.h

@@ -471,6 +471,7 @@ namespace sil_block {
   // The pack_element_get instruction.
   using SILPackElementGetLayout = BCRecordLayout<
     SIL_PACK_ELEMENT_GET,
+    SILInstOpCodeField,
     TypeIDField,            // element type
     SILTypeCategoryField,   // element type category
     TypeIDField,            // pack type

lib/Serialization/Serialization.cpp

@@ -5549,6 +5549,7 @@ void Serializer::writeAllDeclsAndTypes() {
   registerDeclTypeAbbr<ExistentialMetatypeTypeLayout>();
   registerDeclTypeAbbr<PrimaryArchetypeTypeLayout>();
   registerDeclTypeAbbr<OpenedArchetypeTypeLayout>();
+  registerDeclTypeAbbr<ElementArchetypeTypeLayout>();
   registerDeclTypeAbbr<OpaqueArchetypeTypeLayout>();
   registerDeclTypeAbbr<PackArchetypeTypeLayout>();
   registerDeclTypeAbbr<ProtocolCompositionTypeLayout>();
@@ -5568,6 +5569,7 @@ void Serializer::writeAllDeclsAndTypes() {
   registerDeclTypeAbbr<DynamicSelfTypeLayout>();
   registerDeclTypeAbbr<PackExpansionTypeLayout>();
   registerDeclTypeAbbr<PackTypeLayout>();
+  registerDeclTypeAbbr<SILPackTypeLayout>();
 
   registerDeclTypeAbbr<ErrorFlagLayout>();
   registerDeclTypeAbbr<ErrorTypeLayout>();

lib/Serialization/SerializeSIL.cpp

@@ -1680,6 +1680,7 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
     auto indexRef = addValueRef(PEGI->getIndex());
     SILPackElementGetLayout::emitRecord(Out, ScratchRecord,
         SILAbbrCodes[SILPackElementGetLayout::Code],
+        (unsigned)SI.getKind(),
         elementTypeRef,
         (unsigned) elementType.getCategory(),
         packTypeRef,
@@ -1721,6 +1722,7 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
     auto indexRef = addValueRef(TPEAI->getIndex());
     SILPackElementGetLayout::emitRecord(Out, ScratchRecord,
         SILAbbrCodes[SILPackElementGetLayout::Code],
+        (unsigned)SI.getKind(),
         elementTypeRef,
         (unsigned) elementType.getCategory(),
         tupleTypeRef,
@@ -3057,6 +3059,8 @@ void SILSerializer::writeSILBlock(const SILModule *SILMod) {
   registerSILAbbr<SILInstLinearFunctionExtractLayout>();
   registerSILAbbr<SILInstIncrementProfilerCounterLayout>();
   registerSILAbbr<SILInstHasSymbolLayout>();
+  registerSILAbbr<SILPackElementGetLayout>();
+  registerSILAbbr<SILPackElementSetLayout>();
 
   registerSILAbbr<VTableLayout>();
   registerSILAbbr<VTableEntryLayout>();

test/SIL/Serialization/pack_expansion_type.swift

@@ -0,0 +1,26 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module %s -emit-module-path %t/pack_expansion_type.swiftmodule -DLIB -enable-experimental-feature VariadicGenerics
+// RUN: %target-swift-frontend -emit-sil %s -I %t -DAPP -module-name main -enable-experimental-feature VariadicGenerics
+
+// Because of -enable-experimental-feature VariadicGenerics
+// REQUIRES: asserts
+
+#if LIB
+
+public func callee<each T>(_: repeat each T) {}
+
+@_transparent public func caller<each T>(_ t: repeat each T) {
+  callee(repeat [each t])
+}
+
+public func calleer() {
+  caller(1, "hi", false)
+}
+
+#elseif APP
+
+import pack_expansion_type
+
+caller(1, "hi", false)
+
+#endif