Add TypeExpansionContext to SIL serialization and parsing

Author: aschwaighofer

lib/ParseSIL/ParseSIL.cpp

@@ -4082,8 +4082,9 @@ bool SILParser::parseSILInstruction(SILBuilder &B) {
       return true;
 
     EnumElementDecl *Elt = cast<EnumElementDecl>(EltRef.getDecl());
-    auto ResultTy = Operand->getType().getEnumElementType(Elt, SILMod);
-    
+    auto ResultTy = Operand->getType().getEnumElementType(
+        Elt, SILMod, B.getTypeExpansionContext());
+
     switch (Opcode) {
     case swift::SILInstructionKind::InitEnumDataAddrInst:
       ResultVal = B.createInitEnumDataAddr(InstLoc, Operand, Elt, ResultTy);
@@ -4431,7 +4432,8 @@ bool SILParser::parseSILInstruction(SILBuilder &B) {
 
     // FIXME: substitution means this type should be explicit to improve
     // performance.
-    auto ResultTy = Val->getType().getFieldType(Field, SILMod);
+    auto ResultTy =
+        Val->getType().getFieldType(Field, SILMod, B.getTypeExpansionContext());
     if (Opcode == SILInstructionKind::StructElementAddrInst)
       ResultVal = B.createStructElementAddr(InstLoc, Val, Field,
                                             ResultTy.getAddressType());
@@ -4453,7 +4455,8 @@ bool SILParser::parseSILInstruction(SILBuilder &B) {
       return true;
     }
     VarDecl *Field = cast<VarDecl>(FieldV);
-    auto ResultTy = Val->getType().getFieldType(Field, SILMod);
+    auto ResultTy =
+        Val->getType().getFieldType(Field, SILMod, B.getTypeExpansionContext());
     ResultVal = B.createRefElementAddr(InstLoc, Val, Field, ResultTy);
     break;
   }
@@ -5136,8 +5139,8 @@ bool SILParser::parseCallInstruction(SILLocation InstLoc,
   CanSILFunctionType substFTI = FTI;
   if (!subs.empty()) {
     auto silFnTy = FnTy.castTo<SILFunctionType>();
-    substFTI
-      = silFnTy->substGenericArgs(SILMod, subs);
+    substFTI =
+        silFnTy->substGenericArgs(SILMod, subs, B.getTypeExpansionContext());
     FnTy = SILType::getPrimitiveObjectType(substFTI);
   }
   SILFunctionConventions substConv(substFTI, B.getModule());