SIL: Fix serialization of open_pack_element

Author: slavapestov

lib/Serialization/DeserializeSIL.cpp

@@ -1284,6 +1284,11 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     SILInstHasSymbolLayout::readRecord(scratch, ValID, ListOfValues);
     RawOpCode = (unsigned)SILInstructionKind::HasSymbolInst;
     break;
+  case SIL_OPEN_PACK_ELEMENT:
+    SILOpenPackElementLayout::readRecord(scratch, Attr,
+                                         TyID, TyCategory, ValID);
+    RawOpCode = (unsigned)SILInstructionKind::OpenPackElementInst;
+    break;
   case SIL_PACK_ELEMENT_GET:
     SILPackElementGetLayout::readRecord(scratch, RawOpCode,
                                         TyID, TyCategory,
@@ -1424,7 +1429,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     break;
   }
   case SILInstructionKind::OpenPackElementInst: {
-    assert(RecordKind == SIL_ONE_OPERAND && "Layout should be OneOperand");
+    assert(RecordKind == SIL_OPEN_PACK_ELEMENT && "Layout should be OpenPackElement");
     auto index = getLocalValue(ValID,
         getSILType(MF->getType(TyID), (SILValueCategory) TyCategory, Fn));
     auto env = MF->getGenericEnvironmentChecked(Attr);

lib/Serialization/SILFormat.h

@@ -159,6 +159,7 @@ namespace sil_block {
     SIL_INST_INCREMENT_PROFILER_COUNTER,
     SIL_MOVEONLY_DEINIT,
     SIL_INST_HAS_SYMBOL,
+    SIL_OPEN_PACK_ELEMENT,
     SIL_PACK_ELEMENT_GET,
     SIL_PACK_ELEMENT_SET,
   };
@@ -468,6 +469,15 @@ namespace sil_block {
     ValueIDField
   >;
 
+  // The pack_element_get instruction.
+  using SILOpenPackElementLayout = BCRecordLayout<
+    SIL_OPEN_PACK_ELEMENT,
+    GenericEnvironmentIDField,
+    TypeIDField,
+    SILTypeCategoryField,
+    ValueIDField
+  >;
+
   // The pack_element_get instruction.
   using SILPackElementGetLayout = BCRecordLayout<
     SIL_PACK_ELEMENT_GET,

lib/Serialization/Serialization.cpp

@@ -926,6 +926,9 @@ void Serializer::writeBlockInfoBlock() {
   BLOCK_RECORD(sil_block, SIL_ONE_OPERAND_EXTRA_ATTR);
   BLOCK_RECORD(sil_block, SIL_ONE_TYPE_ONE_OPERAND_EXTRA_ATTR);
   BLOCK_RECORD(sil_block, SIL_TWO_OPERANDS_EXTRA_ATTR);
+  BLOCK_RECORD(sil_block, SIL_OPEN_PACK_ELEMENT);
+  BLOCK_RECORD(sil_block, SIL_PACK_ELEMENT_GET);
+  BLOCK_RECORD(sil_block, SIL_PACK_ELEMENT_SET);
 
   BLOCK(SIL_INDEX_BLOCK);
   BLOCK_RECORD(sil_index_block, SIL_FUNC_NAMES);

lib/Serialization/SerializeSIL.cpp

@@ -1868,7 +1868,16 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
     auto &opei = cast<OpenPackElementInst>(SI);
     auto envRef =
       S.addGenericEnvironmentRef(opei.getOpenedGenericEnvironment());
-    writeOneOperandLayout(SI.getKind(), envRef, opei.getIndexOperand());
+    auto operand = opei.getIndexOperand();
+    auto operandRef = addValueRef(operand);
+    auto operandType = operand->getType();
+    auto operandTypeRef = S.addTypeRef(operandType.getASTType());
+
+    SILOpenPackElementLayout::emitRecord(Out, ScratchRecord,
+          SILAbbrCodes[SILOpenPackElementLayout::Code],
+          envRef,
+          operandTypeRef, unsigned(operandType.getCategory()),
+          operandRef);
     break;
   }
   case SILInstructionKind::GetAsyncContinuationAddrInst: {
@@ -3058,6 +3067,7 @@ void SILSerializer::writeSILBlock(const SILModule *SILMod) {
   registerSILAbbr<SILInstLinearFunctionExtractLayout>();
   registerSILAbbr<SILInstIncrementProfilerCounterLayout>();
   registerSILAbbr<SILInstHasSymbolLayout>();
+  registerSILAbbr<SILOpenPackElementLayout>();
   registerSILAbbr<SILPackElementGetLayout>();
   registerSILAbbr<SILPackElementSetLayout>();
 

test/SIL/Serialization/pack_expansion_type.swift

@@ -7,27 +7,36 @@
 
 #if LIB
 
-public func callee<each T>(_: repeat each T) {}
+public func calleeWithPack<each T>(_: repeat each T) {}
 
-@_transparent public func caller<each T>(_ t: repeat each T) {
-  callee(repeat [each t])
+public func calleeGeneric<T>(_: T) {}
+
+@_transparent public func transparentCaller<each T>(_ t: repeat each T) {
+  calleeWithPack(repeat [each t])
+  calleeGeneric((repeat [each t]))
+}
+
+@_alwaysEmitIntoClient public func serializedCaller<each T>(_ t: repeat each T) {
+  calleeWithPack(repeat [each t])
+  calleeGeneric((repeat [each t]))
 }
 
-public func calleer() {
-  caller(1, "hi", false)
+public func transparentCaller2() {
+  transparentCaller(1, "hi", false)
 }
 
-public func foo<each T: Equatable>(_: repeat each T) {}
+public func calleeWithRequirement<each T: Equatable>(_: repeat each T) {}
 
-@_transparent public func bar(x: Int, y: String) {
-  foo(x, y)
+@_transparent public func callerWithRequirement(x: Int, y: String) {
+  calleeWithRequirement(x, y)
 }
 
 #elseif APP
 
 import pack_expansion_type
 
-caller(1, "hi", false)
-bar(x: 1, y: "hi")
+transparentCaller(1, "hi", false)
+serializedCaller(1, "hi", false)
+callerWithRequirement(x: 1, y: "hi")
 
 #endif