[silgen] Replace all uses of SILFunctionBuilder with SILGenFunctionBuilder.

This initial implementation just delegates from SILGenFunctionBuilder to
SILFunctionBuilder. I was going to start transforming verbose uses of
SILFunctionBuilder into higher level APIs on SILGenFunctionBuilder, but I have
run out of time.

This is a good incremental step forward that will let me hide the constructor of
SILFunctionBuilder after I update the optimizer and thus ensure that
SILFunctionBuilder is only used through appropriate composition APIs.

rdar://42301529

Author: gottesmm

lib/SILGen/SILGen.cpp

@@ -14,6 +14,7 @@
 #include "ManagedValue.h"
 #include "RValue.h"
 #include "SILGenFunction.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "swift/AST/DiagnosticsSIL.h"
 #include "swift/AST/GenericEnvironment.h"
@@ -29,7 +30,6 @@
 #include "swift/SIL/PrettyStackTrace.h"
 #include "swift/SIL/SILArgument.h"
 #include "swift/SIL/SILDebugScope.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/SILProfiler.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "swift/Serialization/SerializedSILLoader.h"
@@ -430,7 +430,7 @@ SILFunction *SILGenModule::emitTopLevelFunction(SILLocation Loc) {
                                    None,
                                    C);
 
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   return builder.createFunction(
       SILLinkage::Public, SWIFT_ENTRY_POINT_FUNCTION, topLevelType, nullptr,
       Loc, IsBare, IsNotTransparent, IsNotSerialized, ProfileCounter(),
@@ -523,7 +523,7 @@ SILFunction *SILGenModule::getFunction(SILDeclRef constant,
     return emitted;
 
   // Note: Do not provide any SILLocation. You can set it afterwards.
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   auto *F = builder.getOrCreateFunction(constant.hasDecl() ? constant.getDecl()
                                                            : (Decl *)nullptr,
                                         constant, forDefinition);
@@ -1033,7 +1033,7 @@ SILFunction *SILGenModule::emitLazyGlobalInitializer(StringRef funcName,
                                     TupleType::getEmpty(C), type->getExtInfo());
   auto initSILType = getLoweredType(initType).castTo<SILFunctionType>();
 
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   auto *f = builder.createFunction(SILLinkage::Private, funcName, initSILType,
                                    nullptr, SILLocation(binding), IsNotBare,
                                    IsNotTransparent, IsNotSerialized);

lib/SILGen/SILGenConstructor.cpp

@@ -15,13 +15,13 @@
 #include "LValue.h"
 #include "RValue.h"
 #include "SILGenFunction.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/Basic/Defer.h"
 #include "swift/SIL/SILArgument.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/SILUndef.h"
 #include "swift/SIL/TypeLowering.h"
 
@@ -905,7 +905,7 @@ static SILValue getBehaviorInitStorageFn(SILGenFunction &SGF,
                                           SGF.getASTContext());
 
     // TODO: Generate the body of the thunk.
-    SILFunctionBuilder builder(SGF.SGM.M);
+    SILGenFunctionBuilder builder(SGF);
     thunkFn = builder.getOrCreateFunction(
         SILLocation(behaviorVar), behaviorInitName, SILLinkage::PrivateExternal,
         initConstantTy, IsBare, IsTransparent, IsSerialized);

lib/SILGen/SILGenExpr.cpp

@@ -22,6 +22,7 @@
 #include "ResultPlan.h"
 #include "SILGen.h"
 #include "SILGenDynamicCast.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "SwitchEnumBuilder.h"
 #include "Varargs.h"
@@ -40,7 +41,6 @@
 #include "swift/Basic/type_traits.h"
 #include "swift/SIL/DynamicCasts.h"
 #include "swift/SIL/SILArgument.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/SILUndef.h"
 #include "swift/SIL/TypeLowering.h"
 #include "llvm/ADT/STLExtras.h"
@@ -2999,7 +2999,7 @@ static SILFunction *getOrCreateKeyPathGetter(SILGenModule &SGM,
   auto name = Mangle::ASTMangler()
     .mangleKeyPathGetterThunkHelper(property, genericSig, baseType,
                                     interfaceSubs);
-  SILFunctionBuilder builder(SGM.M);
+  SILGenFunctionBuilder builder(SGM);
   auto thunk = builder.getOrCreateSharedFunction(
       loc, name, signature, IsBare, IsNotTransparent, IsNotSerialized,
       ProfileCounter(), IsThunk);
@@ -3122,7 +3122,7 @@ static SILFunction *getOrCreateKeyPathSetter(SILGenModule &SGM,
                                                                 baseType,
                                                                 interfaceSubs);
 
-  SILFunctionBuilder builder(SGM.M);
+  SILGenFunctionBuilder builder(SGM);
   auto thunk = builder.getOrCreateSharedFunction(
       loc, name, signature, IsBare, IsNotTransparent, IsNotSerialized,
       ProfileCounter(), IsThunk);
@@ -3278,7 +3278,7 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
 
     auto name = Mangle::ASTMangler().mangleKeyPathEqualsHelper(indexTypes,
                                                                genericSig);
-    SILFunctionBuilder builder(SGM.M);
+    SILGenFunctionBuilder builder(SGM);
     equals = builder.getOrCreateSharedFunction(
         loc, name, signature, IsBare, IsNotTransparent, IsNotSerialized,
         ProfileCounter(), IsThunk);
@@ -3443,7 +3443,7 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
 
     auto name = Mangle::ASTMangler().mangleKeyPathHashHelper(indexTypes,
                                                              genericSig);
-    SILFunctionBuilder builder(SGM.M);
+    SILGenFunctionBuilder builder(SGM);
     hash = builder.getOrCreateSharedFunction(loc, name, signature, IsBare,
                                              IsNotTransparent, IsNotSerialized,
                                              ProfileCounter(), IsThunk);

lib/SILGen/SILGenFunction.cpp

@@ -17,10 +17,10 @@
 
 #include "SILGenFunction.h"
 #include "RValue.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "swift/AST/Initializer.h"
 #include "swift/SIL/SILArgument.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/SILProfiler.h"
 #include "swift/SIL/SILUndef.h"
 
@@ -462,7 +462,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
     ValueDecl *UIApplicationMainDecl = results.front();
 
     auto mainRef = SILDeclRef(UIApplicationMainDecl).asForeign();
-    SILFunctionBuilder builder(SGM.M);
+    SILGenFunctionBuilder builder(SGM);
     auto UIApplicationMainFn =
         builder.getOrCreateFunction(mainClass, mainRef, NotForDefinition);
     auto fnTy = UIApplicationMainFn->getLoweredFunctionType();
@@ -581,7 +581,7 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
                   /*error result*/ None,
                   getASTContext());
 
-    SILFunctionBuilder builder(SGM.M);
+    SILGenFunctionBuilder builder(SGM);
     auto NSApplicationMainFn = builder.getOrCreateFunction(
         mainClass, "NSApplicationMain", SILLinkage::PublicExternal,
         NSApplicationMainType, IsBare, IsTransparent, IsNotSerialized);

lib/SILGen/SILGenFunctionBuilder.h

@@ -0,0 +1,46 @@
+//===--- SILGenFunctionBuilder.h ------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SILGEN_SILGENFUNCTIONBUILDER_H
+#define SWIFT_SILGEN_SILGENFUNCTIONBUILDER_H
+
+#include "swift/SIL/SILFunctionBuilder.h"
+
+namespace swift {
+namespace Lowering {
+
+class LLVM_LIBRARY_VISIBILITY SILGenFunctionBuilder {
+  SILFunctionBuilder builder;
+
+public:
+  SILGenFunctionBuilder(SILGenModule &SGM) : builder(SGM.M) {}
+  SILGenFunctionBuilder(SILGenFunction &SGF) : builder(SGF.SGM.M) {}
+
+  template <class... ArgTys>
+  SILFunction *getOrCreateSharedFunction(ArgTys &&... args) {
+    return builder.getOrCreateSharedFunction(std::forward<ArgTys>(args)...);
+  }
+
+  template <class... ArgTys>
+  SILFunction *getOrCreateFunction(ArgTys &&... args) {
+    return builder.getOrCreateFunction(std::forward<ArgTys>(args)...);
+  }
+
+  template <class... ArgTys> SILFunction *createFunction(ArgTys &&... args) {
+    return builder.createFunction(std::forward<ArgTys>(args)...);
+  }
+};
+
+} // namespace Lowering
+} // namespace swift
+
+#endif

lib/SILGen/SILGenMaterializeForSet.cpp

@@ -161,6 +161,7 @@
 #include "LValue.h"
 #include "RValue.h"
 #include "SILGen.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/AST/Decl.h"
@@ -170,7 +171,6 @@
 #include "swift/AST/Types.h"
 #include "swift/SIL/PrettyStackTrace.h"
 #include "swift/SIL/SILArgument.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/SILUndef.h"
 #include "swift/SIL/TypeLowering.h"
 #include "llvm/Support/raw_ostream.h"
@@ -717,7 +717,7 @@ SILFunction *MaterializeForSetEmitter::createCallback(SILFunction &F,
   auto callbackLinkage =
       F.isSerialized() ? SILLinkage::Shared : SILLinkage::Private;
 
-  SILFunctionBuilder builder(SGM.M);
+  SILGenFunctionBuilder builder(SGM);
   auto callback = builder.createFunction(
       callbackLinkage, CallbackName, callbackType, genericEnv,
       SILLocation(Witness), IsBare, F.isTransparent(), F.isSerialized(),

lib/SILGen/SILGenThunk.cpp

@@ -22,13 +22,13 @@
 
 #include "ManagedValue.h"
 #include "SILGenFunction.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/AST/DiagnosticsSIL.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/SIL/PrettyStackTrace.h"
 #include "swift/SIL/SILArgument.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/TypeLowering.h"
 
 using namespace swift;
@@ -50,7 +50,7 @@ SILFunction *SILGenModule::getDynamicThunk(SILDeclRef constant,
   // Mangle the constant with a TD suffix.
   auto name = constant.mangle(SILDeclRef::ManglingKind::DynamicThunk);
 
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   auto F = builder.getOrCreateFunction(
       constant.getDecl(), name, SILLinkage::Shared, constantTy, IsBare,
       IsTransparent, IsSerializable, ProfileCounter(), IsThunk);
@@ -291,7 +291,7 @@ getOrCreateReabstractionThunk(CanSILFunctionType thunkType,
 
   auto loc = RegularLocation::getAutoGeneratedLocation();
 
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   return builder.getOrCreateSharedFunction(
       loc, name, thunkDeclType, IsBare, IsTransparent, IsSerializable,
       ProfileCounter(), IsReabstractionThunk);

lib/SILGen/SILGenType.cpp

@@ -19,6 +19,7 @@
 
 #include "ManagedValue.h"
 #include "SILGenFunction.h"
+#include "SILGenFunctionBuilder.h"
 #include "Scope.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/AST/GenericEnvironment.h"
@@ -28,7 +29,6 @@
 #include "swift/SIL/FormalLinkage.h"
 #include "swift/SIL/PrettyStackTrace.h"
 #include "swift/SIL/SILArgument.h"
-#include "swift/SIL/SILFunctionBuilder.h"
 #include "swift/SIL/SILVTableVisitor.h"
 #include "swift/SIL/SILWitnessVisitor.h"
 #include "swift/SIL/TypeLowering.h"
@@ -131,7 +131,7 @@ SILGenModule::emitVTableMethod(ClassDecl *theClass,
 
   // Emit the thunk.
   SILLocation loc(derivedDecl);
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   auto thunk = builder.createFunction(
       SILLinkage::Private, name, overrideInfo.SILFnType,
       cast<AbstractFunctionDecl>(derivedDecl)->getGenericEnvironment(), loc,
@@ -665,7 +665,7 @@ SILFunction *SILGenModule::emitProtocolWitness(
   if (witnessRef.isAlwaysInline())
     InlineStrategy = AlwaysInline;
 
-  SILFunctionBuilder builder(M);
+  SILGenFunctionBuilder builder(*this);
   auto *f = builder.createFunction(
       linkage, nameBuffer, witnessSILFnType, genericEnv,
       SILLocation(witnessRef.getDecl()), IsNotBare, IsTransparent, isSerialized,