Merge pull request #7112 from swiftix/wip-irgen-fixes

Fix a couple of places in the IRGen where we still don't use interface types

Author: swiftix

lib/IRGen/GenClass.cpp

@@ -1568,8 +1568,10 @@ namespace {
       // metadata statically, so compute the field layout using the
       // originally-declared type.
       SILType fieldType =
-        IGM.getLoweredType(IGM.getSILTypes().getAbstractionPattern(var),
-                           var->getType());
+          IGM.getLoweredType(IGM.getSILTypes().getAbstractionPattern(var),
+                             var->getDeclContext()
+                                 ->mapTypeIntoContext(var->getInterfaceType())
+                                 ->getCanonicalType());
       Ivars.push_back(buildIvar(var, fieldType));
 
       // Build property accessors for the ivar if necessary.

lib/IRGen/GenMeta.cpp

@@ -2438,7 +2438,8 @@ namespace {
                          NominalTypeDecl::StoredPropertyRange storedProperties){
     SmallVector<FieldTypeInfo, 4> types;
     for (VarDecl *prop : storedProperties) {
-      auto propertyType = prop->getType()->getCanonicalType();
+      auto propertyType = type->mapTypeIntoContext(prop->getInterfaceType())
+                              ->getCanonicalType();
       types.push_back(FieldTypeInfo(propertyType,
                                     /*indirect*/ false,
                                     propertyType->is<WeakStorageType>()));
@@ -3213,7 +3214,8 @@ static llvm::Value *emitInitializeFieldOffsetVector(IRGenFunction &IGF,
   Address firstField;
   unsigned index = 0;
   for (auto prop : storedProperties) {
-    auto propFormalTy = prop->getType()->getCanonicalType();
+    auto propFormalTy = target->mapTypeIntoContext(prop->getInterfaceType())
+                            ->getCanonicalType();
     SILType propLoweredTy = IGF.IGM.getLoweredType(propFormalTy);
     auto &propTI = IGF.getTypeInfo(propLoweredTy);
     auto sizeAndAlignMask