SIL: Remove default resilience expansion from isTypeABIAccessible()

Author: slavapestov

include/swift/SIL/SILFunction.h

@@ -482,6 +482,8 @@ class SILFunction
 
   const Lowering::TypeLowering &getTypeLowering(SILType type) const;
 
+  bool isTypeABIAccessible(SILType type) const;
+
   /// Returns true if this function has a calling convention that has a self
   /// argument.
   bool hasSelfParam() const {

include/swift/SIL/SILModule.h

@@ -591,10 +591,8 @@ class SILModule {
 
   /// Can value operations (copies and destroys) on the given lowered type
   /// be performed in this module?
-  // FIXME: Expansion
   bool isTypeABIAccessible(SILType type,
-                           ResilienceExpansion forExpansion
-                             = ResilienceExpansion::Minimal);
+                           ResilienceExpansion forExpansion);
 
   /// Can type metadata for the given formal type be fetched in
   /// the given module?

lib/IRGen/GenEnum.cpp

@@ -6202,8 +6202,7 @@ SingletonEnumImplStrategy::completeEnumTypeLayout(TypeConverter &TC,
     if (TIK <= Opaque) {
       auto alignment = eltTI.getBestKnownAlignment();
       applyLayoutAttributes(TC.IGM, theEnum, /*fixed*/false, alignment);
-      auto enumAccessible =
-        IsABIAccessible_t(TC.IGM.getSILModule().isTypeABIAccessible(Type));
+      auto enumAccessible = IsABIAccessible_t(TC.IGM.isTypeABIAccessible(Type));
       return registerEnumTypeInfo(new NonFixedEnumTypeInfo(*this, enumTy,
                              alignment,
                              eltTI.isPOD(ResilienceExpansion::Maximal),
@@ -6389,8 +6388,7 @@ TypeInfo *SinglePayloadEnumImplStrategy::completeDynamicLayout(
 
   applyLayoutAttributes(TC.IGM, theEnum, /*fixed*/false, alignment);
 
-  auto enumAccessible =
-    IsABIAccessible_t(TC.IGM.getSILModule().isTypeABIAccessible(Type));
+  auto enumAccessible = IsABIAccessible_t(TC.IGM.isTypeABIAccessible(Type));
 
   return registerEnumTypeInfo(new NonFixedEnumTypeInfo(*this, enumTy,
          alignment,
@@ -6590,8 +6588,7 @@ TypeInfo *MultiPayloadEnumImplStrategy::completeDynamicLayout(
 
   applyLayoutAttributes(TC.IGM, theEnum, /*fixed*/false, alignment);
 
-  auto enumAccessible =
-    IsABIAccessible_t(TC.IGM.getSILModule().isTypeABIAccessible(Type));
+  auto enumAccessible = IsABIAccessible_t(TC.IGM.isTypeABIAccessible(Type));
 
   return registerEnumTypeInfo(new NonFixedEnumTypeInfo(*this, enumTy,
                                                        alignment, pod, bt,
@@ -6614,8 +6611,7 @@ ResilientEnumImplStrategy::completeEnumTypeLayout(TypeConverter &TC,
                                                   SILType Type,
                                                   EnumDecl *theEnum,
                                                   llvm::StructType *enumTy) {
-  auto abiAccessible =
-    IsABIAccessible_t(TC.IGM.getSILModule().isTypeABIAccessible(Type));
+  auto abiAccessible = IsABIAccessible_t(TC.IGM.isTypeABIAccessible(Type));
   return registerEnumTypeInfo(
                        new ResilientEnumTypeInfo(*this, enumTy, abiAccessible));
 }

lib/IRGen/GenTuple.cpp

@@ -355,7 +355,7 @@ namespace {
                                      FieldsAreABIAccessible_t fieldsAccessible,
                                           StructLayout &&layout) {
       auto tupleAccessible = IsABIAccessible_t(
-        IGM.getSILModule().isTypeABIAccessible(TheTuple));
+        IGM.isTypeABIAccessible(TheTuple));
       return NonFixedTupleTypeInfo::create(fields, fieldsAccessible,
                                            layout.getType(),
                                            layout.getAlignment(),

lib/IRGen/GenType.cpp

@@ -1433,19 +1433,25 @@ const TypeInfo &IRGenFunction::getTypeInfo(SILType T) {
 }
 
 /// Return the SIL-lowering of the given type.
-SILType IRGenModule::getLoweredType(AbstractionPattern orig, Type subst) {
+SILType IRGenModule::getLoweredType(AbstractionPattern orig, Type subst) const {
   // FIXME: Expansion
   return getSILTypes().getLoweredType(orig, subst,
                                       ResilienceExpansion::Minimal);
 }
 
 /// Return the SIL-lowering of the given type.
-SILType IRGenModule::getLoweredType(Type subst) {
+SILType IRGenModule::getLoweredType(Type subst) const {
   // FIXME: Expansion
   return getSILTypes().getLoweredType(subst,
                                       ResilienceExpansion::Minimal);
 }
 
+bool IRGenModule::isTypeABIAccessible(SILType type) const {
+  // FIXME: Expansion
+  return getSILModule().isTypeABIAccessible(type,
+                                            ResilienceExpansion::Minimal);
+}
+
 /// Get a pointer to the storage type for the given type.  Note that,
 /// unlike fetching the type info and asking it for the storage type,
 /// this operation will succeed for forward-declarations.

lib/IRGen/IRGenModule.h

@@ -747,8 +747,10 @@ class IRGenModule {
   getConformanceInfo(const ProtocolDecl *protocol,
                      const ProtocolConformance *conformance);
 
-  SILType getLoweredType(AbstractionPattern orig, Type subst);
-  SILType getLoweredType(Type subst);
+  SILType getLoweredType(AbstractionPattern orig, Type subst) const;
+  SILType getLoweredType(Type subst) const;
+  bool isTypeABIAccessible(SILType type) const;
+
   const TypeInfo &getTypeInfoForUnlowered(AbstractionPattern orig,
                                           CanType subst);
   const TypeInfo &getTypeInfoForUnlowered(AbstractionPattern orig,

lib/SIL/SILFunction.cpp

@@ -263,6 +263,12 @@ const TypeLowering &SILFunction::getTypeLowering(SILType type) const {
                                            ResilienceExpansion::Minimal);
 }
 
+bool SILFunction::isTypeABIAccessible(SILType type) const {
+  // FIXME: Expansion
+  return getModule().isTypeABIAccessible(type,
+                                         ResilienceExpansion::Minimal);
+}
+
 SILBasicBlock *SILFunction::createBasicBlock() {
   return new (getModule()) SILBasicBlock(this, nullptr, false);
 }

lib/SIL/SILVerifier.cpp

@@ -1913,7 +1913,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
             "Dest address should be lvalue");
     require(SI->getDest()->getType() == SI->getSrc()->getType(),
             "Store operand type and dest type mismatch");
-    require(F.getModule().isTypeABIAccessible(SI->getDest()->getType()),
+    require(F.isTypeABIAccessible(SI->getDest()->getType()),
             "cannot directly copy type with inaccessible ABI");
   }
 
@@ -2328,7 +2328,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
   void checkDestroyAddrInst(DestroyAddrInst *DI) {
     require(DI->getOperand()->getType().isAddress(),
             "Operand of destroy_addr must be address");
-    require(F.getModule().isTypeABIAccessible(DI->getOperand()->getType()),
+    require(F.isTypeABIAccessible(DI->getOperand()->getType()),
             "cannot directly destroy type with inaccessible ABI");
   }