SIL: Generalize SILType::subst() to take SubstOptions

Author: slavapestov

include/swift/SIL/SILType.h

@@ -686,12 +686,12 @@ class SILType {
   SILType subst(Lowering::TypeConverter &tc, TypeSubstitutionFn subs,
                 LookupConformanceFn conformances,
                 CanGenericSignature genericSig = CanGenericSignature(),
-                bool shouldSubstituteOpaqueArchetypes = false) const;
+                SubstOptions options = None) const;
 
   SILType subst(SILModule &M, TypeSubstitutionFn subs,
                 LookupConformanceFn conformances,
                 CanGenericSignature genericSig = CanGenericSignature(),
-                bool shouldSubstituteOpaqueArchetypes = false) const;
+                SubstOptions options = None) const;
 
   SILType subst(Lowering::TypeConverter &tc,
                 InFlightSubstitution &IFS,

lib/IRGen/MetadataRequest.cpp

@@ -539,7 +539,7 @@ SILType IRGenModule::substOpaqueTypesWithUnderlyingTypes(
         getSILModule().isWholeModule());
     auto underlyingTy =
         type.subst(getSILModule(), replacer, replacer, genericSig,
-                   /*substitute opaque*/ true);
+                   SubstFlags::SubstituteOpaqueArchetypes);
     return underlyingTy;
   }
 

lib/SIL/IR/SILFunctionType.cpp

@@ -4571,13 +4571,15 @@ static bool areABICompatibleParamsOrReturns(SILType a, SILType b,
           inFunction->getModule().isWholeModule());
       if (aa.getASTType()->hasOpaqueArchetype())
         opaqueTypesSubstituted = aa.subst(inFunction->getModule(), replacer,
-                                         replacer, CanGenericSignature(), true);
+                                         replacer, CanGenericSignature(),
+                                         SubstFlags::SubstituteOpaqueArchetypes);
 
       auto opaqueTypesSubstituted2 = bb;
       if (bb.getASTType()->hasOpaqueArchetype())
         opaqueTypesSubstituted2 =
             bb.subst(inFunction->getModule(), replacer, replacer,
-                     CanGenericSignature(), true);
+                     CanGenericSignature(),
+                     SubstFlags::SubstituteOpaqueArchetypes);
       if (opaqueTypesSubstituted == opaqueTypesSubstituted2)
         continue;
     }

lib/SIL/IR/SILTypeSubstitution.cpp

@@ -465,35 +465,29 @@ class SILTypeSubstituter :
 
 } // end anonymous namespace
 
-static bool isSubstitutionInvariant(SILType ty,
-                                    bool shouldSubstituteOpaqueArchetypes) {
+static bool isSubstitutionInvariant(SILType ty, SubstOptions options) {
   return (!ty.hasArchetype() &&
           !ty.hasTypeParameter() &&
-          (!shouldSubstituteOpaqueArchetypes ||
+          (!options.contains(SubstFlags::SubstituteOpaqueArchetypes) ||
            !ty.getRawASTType()->hasOpaqueArchetype()));
 }
 
 SILType SILType::subst(TypeConverter &tc, TypeSubstitutionFn subs,
                        LookupConformanceFn conformances,
                        CanGenericSignature genericSig,
-                       bool shouldSubstituteOpaqueArchetypes) const {
-  if (isSubstitutionInvariant(*this, shouldSubstituteOpaqueArchetypes))
+                       SubstOptions options) const {
+  if (isSubstitutionInvariant(*this, options))
     return *this;
 
-  auto substOptions =
-    (shouldSubstituteOpaqueArchetypes
-       ? SubstOptions(SubstFlags::SubstituteOpaqueArchetypes)
-       : SubstOptions(None));
-  InFlightSubstitution IFS(subs, conformances, substOptions);
-
+  InFlightSubstitution IFS(subs, conformances, options);
   SILTypeSubstituter STST(tc, TypeExpansionContext::minimal(), IFS,
                           genericSig);
   return STST.subst(*this);
 }
 
 SILType SILType::subst(TypeConverter &tc, InFlightSubstitution &IFS,
                        CanGenericSignature genericSig) const {
-  if (isSubstitutionInvariant(*this, IFS.shouldSubstituteOpaqueArchetypes()))
+  if (isSubstitutionInvariant(*this, IFS.getOptions()))
     return *this;
 
   SILTypeSubstituter STST(tc, TypeExpansionContext::minimal(), IFS,
@@ -504,9 +498,8 @@ SILType SILType::subst(TypeConverter &tc, InFlightSubstitution &IFS,
 SILType SILType::subst(SILModule &M, TypeSubstitutionFn subs,
                        LookupConformanceFn conformances,
                        CanGenericSignature genericSig,
-                       bool shouldSubstituteOpaqueArchetypes) const {
-  return subst(M.Types, subs, conformances, genericSig,
-               shouldSubstituteOpaqueArchetypes);
+                       SubstOptions options) const {
+  return subst(M.Types, subs, conformances, genericSig, options);
 }
 
 SILType SILType::subst(TypeConverter &tc, SubstitutionMap subs) const {
@@ -521,7 +514,7 @@ SILType SILType::subst(SILModule &M, SubstitutionMap subs) const{
 
 SILType SILType::subst(SILModule &M, SubstitutionMap subs,
                        TypeExpansionContext context) const {
-  if (isSubstitutionInvariant(*this, false))
+  if (isSubstitutionInvariant(*this, None))
     return *this;
 
   InFlightSubstitutionViaSubMap IFS(subs, None);