clean up subs

value interface type

Author: Azoy

lib/SILGen/SILGenApply.cpp

@@ -3357,15 +3357,7 @@ void DelayedArgument::emitDefaultArgument(SILGenFunction &SGF,
 
         auto pbd = var->getParentPatternBinding();
         auto entry = pbd->getPatternEntryForVarDecl(var);
-
-        SubstitutionMap subs;
-        auto *genericEnv = ctor->getGenericEnvironmentOfContext();
-        auto typeGenericSig = 
-          var->getDeclContext()->getGenericSignatureOfContext();
-
-        if (genericEnv && typeGenericSig) {
-          subs = info.defaultArgsOwner.getSubstitutions();
-        }
+        auto subs = info.defaultArgsOwner.getSubstitutions();
 
         value = SGF.emitApplyOfStoredPropertyInitializer(info.loc,
                                                          entry, subs,

lib/Sema/CodeSynthesis.cpp

@@ -1679,7 +1679,7 @@ static void maybeAddMemberwiseDefaultArg(ParamDecl *arg, VarDecl *var,
   // to nil literal. This is useful when we need to print the constructor.
   // Note, this will always be the sugared T? because we don't default init an
   // explicit Optional<T>.
-  if (isa<OptionalType>(var->getType().getPointer()) &&
+  if (isa<OptionalType>(var->getValueInterfaceType().getPointer()) &&
       !var->getParentInitializer())
     arg->setDefaultArgumentKind(DefaultArgumentKind::NilLiteral);
 }