Merge pull request #24276 from compnerd/strike-three-and-youre-out

Author: swift-ci

lib/SILGen/SILGenFunction.cpp

@@ -556,7 +556,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
     SILValue args[] = {argc, managedArgv.getValue(), nilValue,
                        optName.getValue()};
 
-    B.createApply(mainClass, UIApplicationMain, {}, args, false);
+    B.createApply(mainClass, UIApplicationMain, SubstitutionMap{}, args, false);
     SILValue r = B.createIntegerLiteral(mainClass,
                         SILType::getBuiltinIntegerType(32, ctx), 0);
     auto rType = F.getConventions().getSingleSILResultType();
@@ -601,7 +601,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
     auto NSApplicationMain = B.createFunctionRef(mainClass, NSApplicationMainFn);
     SILValue args[] = { argc, argv };
 
-    B.createApply(mainClass, NSApplicationMain, {}, args, false);
+    B.createApply(mainClass, NSApplicationMain, SubstitutionMap{}, args, false);
     SILValue r = B.createIntegerLiteral(mainClass,
                         SILType::getBuiltinIntegerType(32, getASTContext()), 0);
     auto rType = F.getConventions().getSingleSILResultType();

lib/SILGen/SILGenGlobalVariable.cpp

@@ -75,7 +75,7 @@ SILGenFunction::emitGlobalVariableRef(SILLocation loc, VarDecl *var) {
                             SILDeclRef(var, SILDeclRef::Kind::GlobalAccessor),
                                                   NotForDefinition);
     SILValue accessor = B.createFunctionRefFor(loc, accessorFn);
-    SILValue addr = B.createApply(loc, accessor, {}, {}, false);
+    SILValue addr = B.createApply(loc, accessor, SubstitutionMap{}, {}, false);
     // FIXME: It'd be nice if the result of the accessor was natively an
     // address.
     addr = B.createPointerToAddress(